Overview
Comment: | Add support for fetching some SAN types from X509 certificates
Note: valgrind complains about uninitialized data when UTF8Strings are passed to |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
ca9555b85f9a4b70a1d2c9498f024c83 |
User & Date: | florob@babelmonkeys.de on 2011-10-08 03:44:36 |
Other Links: | manifest | tags |
Context
2011-10-22
| ||
15:46 |
Use -[pendingBytes] of the superclass if we have no SSL context. This happens if we are a listening socket. check-in: 704eff4870 user: js tags: trunk | |
2011-10-08
| ||
03:44 | Add support for fetching some SAN types from X509 certificates check-in: ca9555b85f user: florob@babelmonkeys.de tags: trunk | |
2011-10-07
| ||
23:56 | Break out some ASN.1 to OFString conversion functionality check-in: 8cb0b716ea user: florob@babelmonkeys.de tags: trunk | |
Changes
Modified src/X509Certificate.h from [24b4f5fcd2] to [61c41fa21c].
︙ | ︙ | |||
34 35 36 37 38 39 40 41 42 43 44 | // @property (opts) Type *name; #endif - initWithFile: (OFString*)file; - initWithStruct: (X509*)cert; - (OFDictionary*)issuer; - (OFDictionary*)subject; - (OFDictionary*)X509_dictionaryFromX509Name: (X509_NAME*)name; - (OFString*)X509_stringFromASN1Object: (ASN1_OBJECT*)obj; - (OFString*) X509_stringFromASN1String: (ASN1_STRING*)str; @end | > | 34 35 36 37 38 39 40 41 42 43 44 45 | // @property (opts) Type *name; #endif - initWithFile: (OFString*)file; - initWithStruct: (X509*)cert; - (OFDictionary*)issuer; - (OFDictionary*)subject; - (OFDictionary*)subjectAlternativeName; - (OFDictionary*)X509_dictionaryFromX509Name: (X509_NAME*)name; - (OFString*)X509_stringFromASN1Object: (ASN1_OBJECT*)obj; - (OFString*) X509_stringFromASN1String: (ASN1_STRING*)str; @end |
Modified src/X509Certificate.m from [235fa6b4e5] to [dae3d0c933].
︙ | ︙ | |||
17 18 19 20 21 22 23 24 25 26 27 28 29 30 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ #include <openssl/crypto.h> #import "X509Certificate.h" #import <ObjFW/OFAutoreleasePool.h> #import <ObjFW/OFDataArray.h> #import <ObjFW/OFDictionary.h> #import <ObjFW/OFFile.h> | > | 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ #include <openssl/crypto.h> #include <openssl/x509v3.h> #import "X509Certificate.h" #import <ObjFW/OFAutoreleasePool.h> #import <ObjFW/OFDataArray.h> #import <ObjFW/OFDictionary.h> #import <ObjFW/OFFile.h> |
︙ | ︙ | |||
91 92 93 94 95 96 97 98 99 100 101 102 103 104 | } - (OFDictionary*)subject { X509_NAME *name = X509_get_subject_name(crt); return [self X509_dictionaryFromX509Name: name]; } - (OFDictionary*)X509_dictionaryFromX509Name: (X509_NAME*)name { int i; int count = X509_NAME_entry_count(name); OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; OFMutableDictionary *dict = [OFMutableDictionary dictionary]; | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 | } - (OFDictionary*)subject { X509_NAME *name = X509_get_subject_name(crt); return [self X509_dictionaryFromX509Name: name]; } - (OFDictionary*)subjectAlternativeName { int i = -1, j; OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; OFMutableDictionary *ret = [OFMutableDictionary dictionary]; while ((i = X509_get_ext_by_NID(crt, NID_subject_alt_name, i)) != -1) { X509_EXTENSION *extension; STACK_OF(GENERAL_NAME) *values; int count; extension = X509_get_ext(crt, i); if (extension == NULL) break; values = X509V3_EXT_d2i(extension); if (values == NULL) break; count = sk_GENERAL_NAME_num(values); for (j = 0; j < count; j++) { GENERAL_NAME *generalName; generalName = sk_GENERAL_NAME_value(values, j); switch(generalName->type) { case GEN_OTHERNAME: { OTHERNAME *otherName = generalName->d.otherName; OFMutableDictionary *types; OFList *list; OFString *key; types = [ret objectForKey: @"otherName"]; if (types == nil) { types = [OFMutableDictionary dictionary]; [ret setObject: types forKey: @"otherName"]; } key = [self X509_stringFromASN1Object: otherName->type_id]; list = [types objectForKey: key]; if (list == nil) { list = [OFList list]; [types setObject: list forKey: key]; } [list appendObject: [self X509_stringFromASN1String: otherName->value->value.asn1_string]]; break; } case GEN_EMAIL: { OFList *list; list = [ret objectForKey: @"rfc822Name"]; if (list == nil) { list = [OFList list]; [ret setObject: list forKey: @"rfc822Name"]; } [list appendObject: [self X509_stringFromASN1String: generalName->d.rfc822Name]]; break; } case GEN_DNS: { OFList *list; list = [ret objectForKey: @"dNSName"]; if (list == nil) { list = [OFList list]; [ret setObject: list forKey: @"dNSName"]; } [list appendObject: [self X509_stringFromASN1String: generalName->d.dNSName]]; break; } case GEN_URI: { OFList *list; list = [ret objectForKey: @"uniformResourceIdentifier"]; if (list == nil) { list = [OFList list]; [ret setObject: list forKey: @"uniformResourceIdentifier"]; } [list appendObject: [self X509_stringFromASN1String: generalName->d.uniformResourceIdentifier]]; break; } case GEN_IPADD: { OFList *list; list = [ret objectForKey: @"iPAddress"]; if (list == nil) { list = [OFList list]; [ret setObject: list forKey: @"iPAddress"]; } [list appendObject: [self X509_stringFromASN1String: generalName->d.iPAddress]]; break; } default: break; } } i++; /* Next extension */ } [ret makeImmutable]; [ret retain]; [pool release]; return [ret autorelease]; } - (OFDictionary*)X509_dictionaryFromX509Name: (X509_NAME*)name { int i; int count = X509_NAME_entry_count(name); OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; OFMutableDictionary *dict = [OFMutableDictionary dictionary]; |
︙ | ︙ |