ObjOpenSSL  Check-in [16079bc1a0]

Overview
Comment:Rename initWithStruct: to initWithX509Struct: to avoid potential conflicts
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 16079bc1a081009db3fae806e462adbcbd4505522b76bb73fc269764d690a7fe
User & Date: florob@babelmonkeys.de on 2011-10-24 00:06:41
Other Links: manifest | tags
Context
2011-10-29
22:50
Add defines for some common OIDs check-in: 5deab0aa50 user: florob@babelmonkeys.de tags: trunk
2011-10-24
00:06
Rename initWithStruct: to initWithX509Struct: to avoid potential conflicts check-in: 16079bc1a0 user: florob@babelmonkeys.de tags: trunk
00:04
Add missing autorelease call check-in: 7a08940b40 user: florob@babelmonkeys.de tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified src/SSLSocket.m from [a3a5b1090c] to [2c8d4cbc06].

︙︙
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368

- (X509Certificate*)peerCertificate
{
	X509 *certificate = SSL_get_peer_certificate(ssl);
	if (!certificate)
		return nil;

	return [[[X509Certificate alloc]
		initWithStruct: certificate] autorelease];
}

- (void)verifyPeerCertificate
{
	unsigned long ret;
	if ((SSL_get_peer_certificate(ssl) == NULL)
	    || ((ret = SSL_get_verify_result(ssl)) != X509_V_OK)) {








|








354
355
356
357
358
359
360
361
362
363
364
365
366
367
368

- (X509Certificate*)peerCertificate
{
	X509 *certificate = SSL_get_peer_certificate(ssl);
	if (!certificate)
		return nil;

	return [[[X509Certificate alloc]
		initWithX509Struct: certificate] autorelease];
}

- (void)verifyPeerCertificate
{
	unsigned long ret;
	if ((SSL_get_peer_certificate(ssl) == NULL)
	    || ((ret = SSL_get_verify_result(ssl)) != X509_V_OK)) {
︙︙

Modified src/X509Certificate.h from [61c41fa21c] to [f0e2fb7daf].

︙︙
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45

}

#ifdef OF_HAVE_PROPERTIES
// @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








|








31
32
33
34
35
36
37
38
39
40
41
42
43
44
45

}

#ifdef OF_HAVE_PROPERTIES
// @property (opts) Type *name;
#endif

- initWithFile: (OFString*)file;
- initWithX509Struct: (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 [dae3d0c933] to [ea8865b8c0].

︙︙
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70

		[self release];
		@throw e;
	}

	return self;
}

- initWithStruct: (X509*)cert
{
	self = [self init];

	@try {
		crt = X509_dup(cert);
		if (crt == NULL)
			@throw [OFInitializationFailedException








|








56
57
58
59
60
61
62
63
64
65
66
67
68
69
70

		[self release];
		@throw e;
	}

	return self;
}

- initWithX509Struct: (X509*)cert
{
	self = [self init];

	@try {
		crt = X509_dup(cert);
		if (crt == NULL)
			@throw [OFInitializationFailedException
︙︙