ObjOpenSSL  Diff

Differences From Artifact [43e9829432]:

To Artifact [694ef5d705]:


88
89
90
91
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
234
235
236
237
238



239
240
241
242
243
244
245
246

247
248


249
250

251
252
253

254
255
256
257
258
259
260
88
89
90
91
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
234
235

236
237
238
239
240
241
242
243
244
245
246
247

248

249

250
251
252
253
254
255
256
257







-
+











+
+
-
-
-
+
+
+
+
+
-






+
+
-
-
-
+
+
+
+
+
-






+
+
+
+

-
+

-
-
+
+
-

+



-
+

-
+
-


-
+
-





+




-
+


-




-
-
+
+

















-
-
+
-
-











-
-
+
-
-










-
-
+
-
-

-
+



-
-
+
+





-
-
+
-
-






-
-
-
+
+
+

-






+


+
+

-
+
-

-
+







		X509_free(crt);

	[super dealloc];
}

- (OFString*)description
{
	OFMutableString *ret = nil;//[OFMutableString string];
	OFMutableString *ret = [OFMutableString string];

	[ret appendFormat: @"Issuer: %@\n\n", [self issuer]];
	[ret appendFormat: @"Subject: %@\n\n", [self subject]];
	[ret appendFormat: @"SANs: %@", [self subjectAlternativeName]];

	[ret makeImmutable];
	return ret;
}

- (OFDictionary*)issuer
{
	X509_NAME *name;

	if (issuer == nil) {
		X509_NAME *name = X509_get_issuer_name(crt);
		issuer = [[self X509_dictionaryFromX509Name: name] retain];
	if (issuer != nil)
		return [[issuer copy] autorelease];

	name = X509_get_issuer_name(crt);
	issuer = [[self X509_dictionaryFromX509Name: name] retain];
	}

	return issuer;
}

- (OFDictionary*)subject
{
	X509_NAME *name;

	if (subject == nil) {
		X509_NAME *name = X509_get_subject_name(crt);
		subject = [[self X509_dictionaryFromX509Name: name] retain];
	if (subject != nil)
		return [[subject copy] autorelease];

	name = X509_get_subject_name(crt);
	subject = [[self X509_dictionaryFromX509Name: name] retain];
	}

	return subject;
}

- (OFDictionary*)subjectAlternativeName
{
	OFAutoreleasePool *pool;
	OFMutableDictionary *ret;
	int i;

	if (subjectAlternativeName != nil)
		return subjectAlternativeName;
		return [[subjectAlternativeName copy] autorelease];

	int i = -1, j;
	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
	ret = [OFMutableDictionary dictionary];
	pool = [[OFAutoreleasePool alloc] init];
	OFMutableDictionary *ret = [OFMutableDictionary dictionary];

	i = -1;
	while ((i = X509_get_ext_by_NID(crt, NID_subject_alt_name, i)) != -1) {
		X509_EXTENSION *extension;
		STACK_OF(GENERAL_NAME) *values;
		int count;
		int j, count;

		extension = X509_get_ext(crt, i);
		if ((extension = X509_get_ext(crt, i)) == NULL)
		if (extension == NULL)
			break;

		values = X509V3_EXT_d2i(extension);
		if ((values = X509V3_EXT_d2i(extension)) == NULL)
		if (values == NULL)
			break;

		count = sk_GENERAL_NAME_num(values);
		for (j = 0; j < count; j++) {
			GENERAL_NAME *generalName;
			OFList *list;

			generalName = sk_GENERAL_NAME_value(values, j);

			switch(generalName->type) {
			case GEN_OTHERNAME: {
			case GEN_OTHERNAME:;
				OTHERNAME *otherName = generalName->d.otherName;
				OFMutableDictionary *types;
				OFList *list;
				OFString *key;

				types = [ret objectForKey: @"otherName"];
				if (types == nil) {
					types
					    = [OFMutableDictionary dictionary];
					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: {
			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: {
			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: {
			case GEN_URI:
				OFList *list;

				list = [ret objectForKey:
					   @"uniformResourceIdentifier"];
				    @"uniformResourceIdentifier"];
				if (list == nil) {
					list = [OFList list];
					[ret setObject: list
						forKey:
						  @"uniformResourceIdentifier"];
						forKey: @"uniformResource"
							@"Identifier"];
				}
				[list appendObject:
				    [self X509_stringFromASN1String:
				    generalName->d.uniformResourceIdentifier]];
				break;
			}
			case GEN_IPADD: {
			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]];
				[list appendObject: [self
				    X509_stringFromASN1String:
				    generalName->d.iPAddress]];
				break;
			}
			default:
				break;
			}
		}

		i++; /* Next extension */
		[pool releaseObjects];
	}

	[pool release];

	[ret makeImmutable];
	[ret retain];
	subjectAlternativeName = [ret retain];
	[pool release];

	return (subjectAlternativeName = ret);
	return ret;
}

- (BOOL)hasCommonNameMatchingDomain: (OFString*)domain
{
	OFString *name;
	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
	OFList *CNs = [[self subject] objectForKey: OID_commonName];
305
306
307
308
309
310
311
312

313
314

315
316
317
318
319
320
321
322
323
324
325
326
327
328


329
330
331
332
333
334
335

336

337

338
339
340
341
342
343
344


345
346
347
348

349
350


351
352
353
354
355
356
357
358
359
360

361
362
363

364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380




381
382
383

384

385
386
387
388

389

390
391
392
393
394
395
396
397
398
399
















400
401
402
403

404

405
406
407



408


409
410





411
412
413
414
415
416
417
418
419
420
421
422
302
303
304
305
306
307
308

309


310
311
312
313
314
315
316
317
318
319
320
321
322


323
324
325
326
327
328
329
330
331
332
333
334

335
336
337
338
339
340


341
342
343
344
345
346
347


348
349
350
351
352
353
354
355
356
357
358

359

360

361
362
363
364
365
366
367
368
369
370
371
372
373
374
375



376
377
378
379

380
381
382

383
384
385
386

387
388
389










390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408

409
410
411



412
413
414
415
416
417


418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434







-
+
-
-
+












-
-
+
+







+

+
-
+





-
-
+
+




+
-
-
+
+









-
+
-

-
+














-
-
-
+
+
+
+
-


+
-
+



-
+

+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+



-
+

+
-
-
-
+
+
+

+
+
-
-
+
+
+
+
+













	service = [service stringByAppendingString: @"."];
	serviceLength = [service length];

	for (name in assertedNames) {
		if ([name hasPrefix: service]) {
			OFString *asserted;
			asserted = [name substringWithRange:
			asserted = [name substringWithRange: of_range(
				of_range(serviceLength,
					[name length] - serviceLength)];
			    serviceLength, [name length] - serviceLength)];
			if ([self X509_isAssertedDomain: asserted
					    equalDomain: domain]) {
				[pool release];
				return YES;
			}
		}
	}

	[pool release];
	return NO;
}

- (BOOL) X509_isAssertedDomain: (OFString*)asserted
		   equalDomain: (OFString*)domain
- (BOOL)X509_isAssertedDomain: (OFString*)asserted
		  equalDomain: (OFString*)domain
{
	/*
	 * In accordance with RFC 6125 this only allows a wildcard as the
	 * left-most label and matches only the left-most label with it.
	 * E.g. *.example.com matches foo.example.com,
	 * but not foo.bar.example.com
	 */

	size_t firstDot;

	if (![asserted caseInsensitiveCompare: domain])
	if ([asserted caseInsensitiveCompare: domain] == OF_ORDERED_SAME)
		return YES;

	if (![asserted hasPrefix: @"*."])
		return NO;

	asserted = [asserted substringWithRange: of_range(2,
			[asserted length] - 2)];
	asserted = [asserted substringWithRange:
	    of_range(2, [asserted length] - 2)];

	firstDot = [domain indexOfFirstOccurrenceOfString: @"."];
	if (firstDot == OF_INVALID_INDEX)
		return NO;

	domain = [domain substringWithRange: of_range(firstDot + 1,
			[domain length] - firstDot - 1)];
	domain = [domain substringWithRange:
	    of_range(firstDot + 1, [domain length] - firstDot - 1)];

	if (![asserted caseInsensitiveCompare: domain])
		return YES;

	return NO;
}

- (OFDictionary*)X509_dictionaryFromX509Name: (X509_NAME*)name
{
	int i;
	OFMutableDictionary *dict = [OFMutableDictionary dictionary];
	int count = X509_NAME_entry_count(name);
	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
	OFMutableDictionary *dict = [OFMutableDictionary dictionary];
	int i, count = X509_NAME_entry_count(name);

	for (i = 0; i < count; i++) {
		OFString *key, *value;
		X509_NAME_ENTRY *entry = X509_NAME_get_entry(name, i);
		ASN1_OBJECT *obj = X509_NAME_ENTRY_get_object(entry);
		ASN1_STRING *str = X509_NAME_ENTRY_get_data(entry);
		key = [self X509_stringFromASN1Object: obj];

		if ([dict objectForKey: key] == nil)
			[dict setObject: [OFList list]
				 forKey: key];

		value = [self X509_stringFromASN1String: str];
		[[dict objectForKey: key] appendObject: value];
	}

	[dict makeImmutable];

		[pool releaseObjects];
	}

	[dict retain];
	[pool release];

	[dict makeImmutable];
	return [dict autorelease];
	return dict;
}


- (OFString*)X509_stringFromASN1Object: (ASN1_OBJECT*)obj
- (OFString*)X509_stringFromASN1Object: (ASN1_OBJECT*)object
{
	OFString *ret;
	int len, buf_len = 256;
	char *buf = [self allocMemoryWithSize: buf_len];
	OFString *ret;
	while ((len = OBJ_obj2txt(buf, buf_len, obj, 1)) > buf_len) {
		buf_len = len;
		[self resizeMemory: buf
			    toSize: buf_len];
	}
	ret = [X509OID stringWithUTF8String: buf];
	[self freeMemory: buf];
	int length, bufferLength = 256;
	char *buffer = [self allocMemoryWithSize: bufferLength];

	@try {
		while ((length = OBJ_obj2txt(buffer, bufferLength, object,
		    1)) > bufferLength) {
			bufferLength = length;
			buffer = [self resizeMemory: buffer
					     toSize: bufferLength];
		}

		ret = [X509OID stringWithUTF8String: buffer];
	} @finally {
		[self freeMemory: buffer];
	}

	return ret;
}

- (OFString*) X509_stringFromASN1String: (ASN1_STRING*)str
- (OFString*)X509_stringFromASN1String: (ASN1_STRING*)str
{
	OFString *ret;
	char *buf;
	OFString *ret;
	if (ASN1_STRING_to_UTF8((unsigned char**)&buf, str) < 0)
	char *buffer;

	if (ASN1_STRING_to_UTF8((unsigned char**)&buffer, str) < 0)
		@throw [OFInvalidEncodingException exceptionWithClass: isa];

	@try {
	ret = [OFString stringWithUTF8String: buf];
	OPENSSL_free(buf);
		ret = [OFString stringWithUTF8String: buffer];
	} @finally {
		OPENSSL_free(buffer);
	}

	return ret;
}
@end

@implementation X509OID
- (OFString*)description
{
	char tmp[1024];
	OBJ_obj2txt(tmp, sizeof(tmp), OBJ_txt2obj(s->cString, 1), 0);
	return [OFString stringWithUTF8String: tmp];
}
@end