ObjOpenSSL  Check-in [a95890e7ce]

Overview
Comment:Indention.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: a95890e7ce00ce3def8fb4ebaa9958d9770a2f021ef2a3ff910808a906e379c7
User & Date: js on 2012-09-17 15:51:40
Other Links: manifest | tags
Context
2012-09-20
00:14
Adjust to latest ObjFW changes. check-in: 87c3eab6d6 user: js tags: trunk
2012-09-17
15:51
Indention. check-in: a95890e7ce user: js tags: trunk
14:50
Fix uninitialized access (random error message) in certificate verification check-in: 62d33a0d4a user: florob@babelmonkeys.de tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified src/SSLSocket.m from [2a7445a987] to [89dcbc8ece].

︙︙
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310

							    socket: self];

	if (atEndOfStream) {
		OFWriteFailedException *e;

		e = [OFWriteFailedException exceptionWithClass: [self class]
							stream: self
					 requestedLength: length];

#ifndef _WIN32
		e->errNo = ENOTCONN;
#else
		e->errNo = WSAENOTCONN;
#endif









|








296
297
298
299
300
301
302
303
304
305
306
307
308
309
310

							    socket: self];

	if (atEndOfStream) {
		OFWriteFailedException *e;

		e = [OFWriteFailedException exceptionWithClass: [self class]
							stream: self
					       requestedLength: length];

#ifndef _WIN32
		e->errNo = ENOTCONN;
#else
		e->errNo = WSAENOTCONN;
#endif
︙︙
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405

	unsigned long ret;

	if (SSL_get_peer_certificate(ssl) != NULL) {
		if ((ret = SSL_get_verify_result(ssl)) != X509_V_OK) {
			const char *tmp = X509_verify_cert_error_string(ret);
			OFString *reason = [OFString stringWithUTF8String: tmp];
			@throw [SSLInvalidCertificateException
				exceptionWithClass: [self class]
					    reason: reason];
		}
	} else
		@throw [SSLInvalidCertificateException
			exceptionWithClass: [self class]
				    reason: @"No certificate"];
}
@end








|
|



|
|



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

	unsigned long ret;

	if (SSL_get_peer_certificate(ssl) != NULL) {
		if ((ret = SSL_get_verify_result(ssl)) != X509_V_OK) {
			const char *tmp = X509_verify_cert_error_string(ret);
			OFString *reason = [OFString stringWithUTF8String: tmp];
			@throw [SSLInvalidCertificateException
			    exceptionWithClass: [self class]
					reason: reason];
		}
	} else
		@throw [SSLInvalidCertificateException
		    exceptionWithClass: [self class]
				reason: @"No certificate"];
}
@end