Overview
Comment: | Prefix all ivars with an underscore. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
eca3b894f81341076c850af24a442165 |
User & Date: | js on 2013-02-12 17:49:20 |
Other Links: | manifest | tags |
Context
2013-02-12
| ||
18:35 | Fix -[X509OID isEqual:]. check-in: 2e400eadc7 user: js tags: trunk | |
17:49 | Prefix all ivars with an underscore. check-in: eca3b894f8 user: js tags: trunk | |
2013-01-19
| ||
00:36 | Update copyright. check-in: 6bcaf2d54a user: js tags: trunk | |
Changes
Modified src/SSLInvalidCertificateException.h from [44dfc519e8] to [047ae0bfe4].
1 2 3 4 5 6 7 8 9 | /* * Copyright (c) 2011, Florian Zeitz <florob@babelmonkeys.de> * * https://webkeks.org/git/?p=objopenssl.git * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice is present in all copies. * | > | 1 2 3 4 5 6 7 8 9 10 | /* * Copyright (c) 2011, Florian Zeitz <florob@babelmonkeys.de> * Copyright (c) 2013, Jonathan Schleifer <js@webkeks.org> * * https://webkeks.org/git/?p=objopenssl.git * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice is present in all copies. * |
︙ | ︙ | |||
21 22 23 24 25 26 27 | */ #import <ObjFW/OFString.h> #import <ObjFW/OFException.h> @interface SSLInvalidCertificateException: OFException { | | | 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 | */ #import <ObjFW/OFString.h> #import <ObjFW/OFException.h> @interface SSLInvalidCertificateException: OFException { OFString *_reason; } #ifdef OF_HAVE_PROPERTIES @property (readonly, assign) OFString *reason; #endif + exceptionWithClass: (Class)class reason: (OFString*)reason; - initWithClass: (Class)class reason: (OFString*)reason; - (OFString*)reason; @end |
Modified src/SSLInvalidCertificateException.m from [aae2bdffb1] to [5490fca0bd].
1 2 3 4 5 6 7 8 9 | /* * Copyright (c) 2011, Florian Zeitz <florob@babelmonkeys.de> * * https://webkeks.org/git/?p=objopenssl.git * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice is present in all copies. * | > | 1 2 3 4 5 6 7 8 9 10 | /* * Copyright (c) 2011, Florian Zeitz <florob@babelmonkeys.de> * Copyright (c) 2013, Jonathan Schleifer <js@webkeks.org> * * https://webkeks.org/git/?p=objopenssl.git * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice is present in all copies. * |
︙ | ︙ | |||
17 18 19 20 21 22 23 24 25 26 27 | * 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. */ #import "SSLInvalidCertificateException.h" #import <ObjFW/OFNotImplementedException.h> @implementation SSLInvalidCertificateException | > > | | | | | | | | | | | | | | | | | 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 | * 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. */ #import "SSLInvalidCertificateException.h" #import <ObjFW/macros.h> #import <ObjFW/OFNotImplementedException.h> @implementation SSLInvalidCertificateException + exceptionWithClass: (Class)class reason: (OFString*)reason { return [[[self alloc] initWithClass: class reason: reason] autorelease]; } - initWithClass: (Class)class { Class c = [self class]; [self release]; @throw [OFNotImplementedException exceptionWithClass: c selector: _cmd]; } - initWithClass: (Class)class reason: (OFString*)reason { self = [super initWithClass: class]; @try { _reason = [reason copy]; } @catch (id e) { [self release]; @throw e; } return self; } - (void)dealloc { [_reason release]; [super dealloc]; } - (OFString*)description { if (_description != nil) return _description; _description = [[OFString alloc] initWithFormat: @"Invalid certificate! Reason: %@", _reason]; return _description; } - (OFString*)reason { OF_GETTER(_reason, NO) } @end |
Modified src/SSLSocket.h from [7d70089230] to [ebcd9bc588].
︙ | ︙ | |||
25 26 27 28 29 30 31 | #import <ObjFW/OFTCPSocket.h> @class X509Certificate; @interface SSLSocket: OFTCPSocket { | | < | | | < | 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 | #import <ObjFW/OFTCPSocket.h> @class X509Certificate; @interface SSLSocket: OFTCPSocket { SSL *_SSL; OFString *_privateKeyFile, *_certificateFile; BOOL _requestsClientCertificates; } #ifdef OF_HAVE_PROPERTIES @property (copy) OFString *privateKeyFile, *certificateFile; @property BOOL requestsClientCertificates; #endif - initWithSocket: (OFTCPSocket*)socket; - initWithSocket: (OFTCPSocket*)socket privateKeyFile: (OFString*)privateKeyFile certificateFile: (OFString*)certificateFile; |
︙ | ︙ |
Modified src/SSLSocket.m from [743f400258] to [acf401502b].
︙ | ︙ | |||
117 118 119 120 121 122 123 | { return [self initWithSocket: socket privateKeyFile: nil certificateFile: nil]; } - initWithSocket: (OFTCPSocket*)socket | | | | | | | > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 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 | { return [self initWithSocket: socket privateKeyFile: nil certificateFile: nil]; } - initWithSocket: (OFTCPSocket*)socket privateKeyFile: (OFString*)privateKeyFile certificateFile: (OFString*)certificateFile { self = [self init]; @try { /* FIXME: Also allow with accepted sockets */ _privateKeyFile = [privateKeyFile copy]; _certificateFile = [certificateFile copy]; _socket = dup(socket->_socket); if ((_SSL = SSL_new(ctx)) == NULL || !SSL_set_fd(_SSL, _socket)) { close(_socket); _socket = INVALID_SOCKET; @throw [OFInitializationFailedException exceptionWithClass: [self class]]; } SSL_set_connect_state(_SSL); if ((_privateKeyFile != nil && !SSL_use_PrivateKey_file(_SSL, [_privateKeyFile cStringWithEncoding: OF_STRING_ENCODING_NATIVE], SSL_FILETYPE_PEM)) || (_certificateFile != nil && !SSL_use_certificate_file(_SSL, [_certificateFile cStringWithEncoding: OF_STRING_ENCODING_NATIVE], SSL_FILETYPE_PEM)) || SSL_connect(_SSL) != 1) { close(_socket); _socket = INVALID_SOCKET; @throw [OFInitializationFailedException exceptionWithClass: [self class]]; } } @catch (id e) { [self release]; @throw e; } return self; } - (void)dealloc { SSL *SSL_ = _SSL; [_privateKeyFile release]; [_certificateFile release]; [super dealloc]; if (SSL_ != NULL) SSL_free(SSL_); } - (void)connectToHost: (OFString*)host port: (uint16_t)port { [super connectToHost: host port: port]; if ((_SSL = SSL_new(ctx)) == NULL || !SSL_set_fd(_SSL, _socket)) { [super close]; @throw [OFConnectionFailedException exceptionWithClass: [self class] socket: self host: host port: port]; } SSL_set_connect_state(_SSL); if ((_privateKeyFile != nil && !SSL_use_PrivateKey_file(_SSL, [_privateKeyFile cStringWithEncoding: OF_STRING_ENCODING_NATIVE], SSL_FILETYPE_PEM)) || (_certificateFile != nil && !SSL_use_certificate_file(_SSL, [_certificateFile cStringWithEncoding: OF_STRING_ENCODING_NATIVE], SSL_FILETYPE_PEM)) || SSL_connect(_SSL) != 1) { [super close]; @throw [OFConnectionFailedException exceptionWithClass: [self class] socket: self host: host port: port]; } } - (SSLSocket*)accept { SSLSocket *client = (SSLSocket*)[super accept]; if ((client->_SSL = SSL_new(ctx)) == NULL || !SSL_set_fd(client->_SSL, client->_socket)) { /* We only want to close the OFTCPSocket */ object_setClass(client, [OFTCPSocket class]); [client close]; object_setClass(client, object_getClass(self)); @throw [OFAcceptFailedException exceptionWithClass: [self class] socket: self]; } if (_requestsClientCertificates) SSL_set_verify(client->_SSL, SSL_VERIFY_PEER, NULL); SSL_set_accept_state(client->_SSL); if (!SSL_use_PrivateKey_file(client->_SSL, [_privateKeyFile cStringWithEncoding: OF_STRING_ENCODING_NATIVE], SSL_FILETYPE_PEM) || !SSL_use_certificate_file(client->_SSL, [_certificateFile cStringWithEncoding: OF_STRING_ENCODING_NATIVE], SSL_FILETYPE_PEM) || SSL_accept(client->_SSL) != 1) { /* We only want to close the OFTCPSocket */ object_setClass(client, [OFTCPSocket class]); [client close]; object_setClass(client, object_getClass(self)); @throw [OFAcceptFailedException exceptionWithClass: [self class] socket: self]; } return client; } - (void)close { if (_SSL != NULL) SSL_shutdown(_SSL); [super close]; } - (size_t)lowlevelReadIntoBuffer: (void*)buffer length: (size_t)length { ssize_t ret; if (length > INT_MAX) @throw [OFOutOfRangeException exceptionWithClass: [self class]]; if (_socket == INVALID_SOCKET) @throw [OFNotConnectedException exceptionWithClass: [self class] socket: self]; if (_atEndOfStream) { OFReadFailedException *e; e = [OFReadFailedException exceptionWithClass: [self class] stream: self requestedLength: length]; #ifndef _WIN32 e->_errNo = ENOTCONN; #else e->_errNo = WSAENOTCONN; #endif @throw e; } if ((ret = SSL_read(_SSL, buffer, (int)length)) < 0) { if (SSL_get_error(_SSL, ret) == SSL_ERROR_WANT_READ) return 0; @throw [OFReadFailedException exceptionWithClass: [self class] stream: self requestedLength: length]; } if (ret == 0) _atEndOfStream = YES; return ret; } - (void)lowlevelWriteBuffer: (const void*)buffer length: (size_t)length { if (length > INT_MAX) @throw [OFOutOfRangeException exceptionWithClass: [self class]]; if (_socket == INVALID_SOCKET) @throw [OFNotConnectedException exceptionWithClass: [self class] 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 @throw e; } if (SSL_write(_SSL, buffer, (int)length) < length) @throw [OFWriteFailedException exceptionWithClass: [self class] stream: self requestedLength: length]; } - (size_t)pendingBytes { if (_SSL == NULL) return [super pendingBytes]; return [super pendingBytes] + SSL_pending(_SSL); } - (void)setPrivateKeyFile: (OFString*)privateKeyFile { OF_SETTER(_privateKeyFile, privateKeyFile, YES, YES) } - (OFString*)privateKeyFile { OF_GETTER(_privateKeyFile, YES) } - (void)setCertificateFile: (OFString*)certificateFile { OF_SETTER(_certificateFile, certificateFile, YES, YES) } - (OFString*)certificateFile { OF_GETTER(_certificateFile, YES) } - (void)setRequestsClientCertificates: (BOOL)enabled { _requestsClientCertificates = enabled; } - (BOOL)requestsClientCertificates { return _requestsClientCertificates; } - (OFDataArray*)channelBindingDataWithType: (OFString*)type { size_t length; char buffer[64]; OFDataArray *data; if (![type isEqual: @"tls-unique"]) @throw [OFInvalidArgumentException exceptionWithClass: [self class] selector: _cmd]; if (SSL_session_reused(_SSL) ^ !_listening) { /* * We are either client or the session has been resumed * => we have sent the finished message */ length = SSL_get_finished(_SSL, buffer, 64); } else { /* peer sent the finished message */ length = SSL_get_peer_finished(_SSL, buffer, 64); } data = [OFDataArray dataArray]; [data addItems: buffer count: length]; return data; } - (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) { 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 |
︙ | ︙ |
Modified src/X509Certificate.h from [1c58919192] to [cc9b5aa091].
1 2 3 4 5 6 7 8 9 | /* * Copyright (c) 2011, Florian Zeitz <florob@babelmonkeys.de> * * https://webkeks.org/git/?p=objopenssl.git * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice is present in all copies. * | > | 1 2 3 4 5 6 7 8 9 10 | /* * Copyright (c) 2011, Florian Zeitz <florob@babelmonkeys.de> * Copyright (c) 2013, Jonathan Schleifer <js@webkeks.org> * * https://webkeks.org/git/?p=objopenssl.git * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice is present in all copies. * |
︙ | ︙ | |||
38 39 40 41 42 43 44 | #define OID_organizationName @"2.5.4.10" #define OID_organizationalUnitName @"2.5.4.11" #define OID_SRVName @"1.3.6.1.5.5.7.8.7" @interface X509OID: OFObject <OFCopying> { | | | | | | | | 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 | #define OID_organizationName @"2.5.4.10" #define OID_organizationalUnitName @"2.5.4.11" #define OID_SRVName @"1.3.6.1.5.5.7.8.7" @interface X509OID: OFObject <OFCopying> { OFString *_string; } - initWithUTF8String: (const char*)string; @end @interface X509Certificate: OFObject { X509 *_certificate; OFDictionary *_issuer; OFDictionary *_subject; OFDictionary *_subjectAlternativeName; } #ifdef OF_HAVE_PROPERTIES @property (readonly) OFDictionary *issuer, *subject, *subjectAlternativeName; #endif - initWithFile: (OFString*)file; |
︙ | ︙ |
Modified src/X509Certificate.m from [79d37925ec] to [d7426f238d].
1 2 | /* * Copyright (c) 2011, Florian Zeitz <florob@babelmonkeys.de> | | | 1 2 3 4 5 6 7 8 9 10 | /* * Copyright (c) 2011, Florian Zeitz <florob@babelmonkeys.de> * Copyright (c) 2011, 2013, Jonathan Schleifer <js@webkeks.org> * * https://webkeks.org/git/?p=objopenssl.git * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice is present in all copies. * |
︙ | ︙ | |||
36 37 38 39 40 41 42 | #import <ObjFW/OFList.h> #import <ObjFW/OFMutableDictionary.h> #import <ObjFW/OFString.h> #import <ObjFW/macros.h> @implementation X509Certificate | | < < | < > > | < | > > | | | | | | | | | | | | | | | | | | | | | > | | 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 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 | #import <ObjFW/OFList.h> #import <ObjFW/OFMutableDictionary.h> #import <ObjFW/OFString.h> #import <ObjFW/macros.h> @implementation X509Certificate - initWithFile: (OFString*)path { self = [self init]; @try { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; OFDataArray *data = [OFDataArray dataArrayWithContentsOfFile: path]; const unsigned char *dataCArray = [data items]; _certificate = d2i_X509(NULL, &dataCArray, [data count]); if (_certificate == NULL) @throw [OFInitializationFailedException exceptionWithClass: [self class]]; [pool release]; } @catch (id e) { [self release]; @throw e; } return self; } - initWithX509Struct: (X509*)certificate { self = [self init]; @try { _certificate = X509_dup(certificate); if (_certificate == NULL) @throw [OFInitializationFailedException exceptionWithClass: [self class]]; } @catch (id e) { [self release]; @throw e; } return self; } - (void)dealloc { [_issuer release]; [_subject release]; [_subjectAlternativeName release]; if (_certificate != NULL) X509_free(_certificate); [super dealloc]; } - (OFString*)description { 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) return [[_issuer copy] autorelease]; name = X509_get_issuer_name(_certificate); _issuer = [[self X509_dictionaryFromX509Name: name] retain]; return _issuer; } - (OFDictionary*)subject { X509_NAME *name; if (_subject != nil) return [[_subject copy] autorelease]; name = X509_get_subject_name(_certificate); _subject = [[self X509_dictionaryFromX509Name: name] retain]; return _subject; } - (OFDictionary*)subjectAlternativeName { OFAutoreleasePool *pool; OFMutableDictionary *ret; int i; if (_subjectAlternativeName != nil) return [[_subjectAlternativeName copy] autorelease]; ret = [OFMutableDictionary dictionary]; pool = [[OFAutoreleasePool alloc] init]; i = -1; while ((i = X509_get_ext_by_NID(_certificate, NID_subject_alt_name, i)) != -1) { X509_EXTENSION *extension; STACK_OF(GENERAL_NAME) *values; int j, count; if ((extension = X509_get_ext(_certificate, i)) == NULL) break; if ((values = X509V3_EXT_d2i(extension)) == NULL) break; count = sk_GENERAL_NAME_num(values); for (j = 0; j < count; j++) { |
︙ | ︙ | |||
244 245 246 247 248 249 250 | i++; /* Next extension */ [pool releaseObjects]; } [pool release]; [ret makeImmutable]; | | | 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 | i++; /* Next extension */ [pool releaseObjects]; } [pool release]; [ret makeImmutable]; _subjectAlternativeName = [ret retain]; return ret; } - (BOOL)hasCommonNameMatchingDomain: (OFString*)domain { OFString *name; |
︙ | ︙ | |||
430 431 432 433 434 435 436 | } return ret; } @end @implementation X509OID | | | | | | | | 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 | } return ret; } @end @implementation X509OID - initWithUTF8String: (const char*)string { self = [self init]; @try { _string = [[OFString alloc] initWithUTF8String: string]; } @catch (id e) { [self release]; @throw e; } return self; } - (void)dealloc { [_string release]; [super dealloc]; } - (OFString*)description { char tmp[1024]; OBJ_obj2txt(tmp, sizeof(tmp), OBJ_txt2obj([_string UTF8String], 1), 0); return [OFString stringWithUTF8String: tmp]; } - (BOOL)isEqual: (id)object { if (([object isKindOfClass: [OFString class]]) || ([object isKindOfClass: [X509OID class]])) return [object isEqual: _string]; return NO; } - (uint32_t)hash { return [_string hash]; } - copy { return [self retain]; } @end |