Overview
Comment: | Use dot syntax |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
ca772cd7fd4289c4789c0d130f9d8b1f |
User & Date: | js on 2019-03-14 22:02:31 |
Other Links: | manifest | tags |
Context
2019-07-14
| ||
18:58 | Adjust to ObjFW changes check-in: 0fcda2add4 user: js tags: trunk | |
2019-03-14
| ||
22:02 | Use dot syntax check-in: ca772cd7fd user: js tags: trunk | |
2019-01-23
| ||
20:07 | Remove unused variable check-in: f0aa4a913f user: js tags: trunk | |
Changes
Modified src/SSLConnectionFailedException.m from [3fe5f58a63] to [10c93bcda0].
︙ | ︙ | |||
144 145 146 147 148 149 150 | else return [OFString stringWithFormat: @"A connection to %@ on port %" @PRIu16 @" could " @"not be established in socket of type %@: %s", _host, _port, [_socket class], error]; } | | | 144 145 146 147 148 149 150 151 152 153 | else return [OFString stringWithFormat: @"A connection to %@ on port %" @PRIu16 @" could " @"not be established in socket of type %@: %s", _host, _port, [_socket class], error]; } return super.description; } @end |
Modified src/SSLSocket.m from [b183119047] to [c3716babf5].
︙ | ︙ | |||
67 68 69 70 71 72 73 | # define INVALID_SOCKET -1 #endif static SSL_CTX *ctx; static of_mutex_t *ssl_mutexes; static unsigned long | | | | 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 | # define INVALID_SOCKET -1 #endif static SSL_CTX *ctx; static of_mutex_t *ssl_mutexes; static unsigned long threadID(void) { return (unsigned long)(uintptr_t)[OFThread currentThread]; } static void lockingCallback(int mode, int n, const char *file, int line) { /* * This function must handle up to CRYPTO_num_locks() mutexes. * It must set the n-th lock if mode & CRYPTO_LOCK, * release it otherwise. */ if (mode & CRYPTO_LOCK) |
︙ | ︙ | |||
120 121 122 123 124 125 126 | @try { _socket = [sock retain]; _host = [host copy]; _port = port; _delegate = [delegate retain]; | | | | | 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 | @try { _socket = [sock retain]; _host = [host copy]; _port = port; _delegate = [delegate retain]; _socket.delegate = self; } @catch (id e) { [self release]; @throw e; } return self; } - (void)dealloc { if (_socket.delegate == self) _socket.delegate = _delegate; [_socket release]; [_delegate release]; [super dealloc]; } |
︙ | ︙ | |||
154 155 156 157 158 159 160 | [sock SSL_startTLSWithExpectedHost: _host port: _port]; } @catch (id e) { exception = e; } } | | | 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 | [sock SSL_startTLSWithExpectedHost: _host port: _port]; } @catch (id e) { exception = e; } } _socket.delegate = _delegate; [_delegate socket: sock didConnectToHost: host port: port exception: exception]; } @end |
︙ | ︙ | |||
183 184 185 186 187 188 189 | + (void)initialize { int m; if (self != [SSLSocket class]) return; | | | | | | 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 | + (void)initialize { int m; if (self != [SSLSocket class]) return; CRYPTO_set_id_callback(&threadID); /* OpenSSL >= 1.1 defines the line above to a nop */ (void)threadID; /* Generate number of mutexes needed */ m = CRYPTO_num_locks(); ssl_mutexes = malloc(m * sizeof(of_mutex_t)); for (m--; m >= 0; m--) of_mutex_new(&ssl_mutexes[m]); CRYPTO_set_locking_callback(&lockingCallback); /* OpenSSL >= 1.1 defines the line above to a nop */ (void)lockingCallback; SSL_library_init(); if ((ctx = SSL_CTX_new(SSLv23_method())) == NULL) @throw [OFInitializationFailedException exceptionWithClass: self]; |
︙ | ︙ | |||
268 269 270 271 272 273 274 | @throw [SSLConnectionFailedException exceptionWithHost: host port: port socket: self SSLError: error]; } | | | | 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 | @throw [SSLConnectionFailedException exceptionWithHost: host port: port socket: self SSLError: error]; } if (SSL_set_tlsext_host_name(_SSL, host.UTF8String) != 1) { unsigned long error = ERR_get_error(); [self close]; @throw [SSLConnectionFailedException exceptionWithHost: host port: port socket: self SSLError: error]; } if (_certificateVerificationEnabled) { X509_VERIFY_PARAM *param = SSL_get0_param(_SSL); X509_VERIFY_PARAM_set_hostflags(param, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS); if (X509_VERIFY_PARAM_set1_host(param, host.UTF8String, host.UTF8StringLength) != 1) { unsigned long error = ERR_get_error(); [self close]; @throw [SSLConnectionFailedException exceptionWithHost: host port: port |
︙ | ︙ | |||
309 310 311 312 313 314 315 | encoding = [OFLocale encoding]; if ((_privateKeyFile != nil && !SSL_use_PrivateKey_file(_SSL, [_privateKeyFile cStringWithEncoding: encoding], SSL_FILETYPE_PEM)) || (_certificateFile != nil && !SSL_use_certificate_file(_SSL, [_certificateFile | | < | 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 | encoding = [OFLocale encoding]; if ((_privateKeyFile != nil && !SSL_use_PrivateKey_file(_SSL, [_privateKeyFile cStringWithEncoding: encoding], SSL_FILETYPE_PEM)) || (_certificateFile != nil && !SSL_use_certificate_file(_SSL, [_certificateFile cStringWithEncoding: encoding], SSL_FILETYPE_PEM))) { unsigned long error = ERR_get_error(); [super close]; @throw [SSLConnectionFailedException exceptionWithHost: host port: port |
︙ | ︙ | |||
496 497 498 499 500 501 502 | } - (bool)hasDataInReadBuffer { if (_SSL != NULL && SSL_pending(_SSL) > 0) return true; | | | 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 | } - (bool)hasDataInReadBuffer { if (_SSL != NULL && SSL_pending(_SSL) > 0) return true; return super.hasDataInReadBuffer; } - (void)setCertificateFile: (OFString *)certificateFile forSNIHost: (OFString *)SNIHost { /* TODO */ OF_UNRECOGNIZED_SELECTOR |
︙ | ︙ |
Modified src/X509Certificate.m from [753b8d7922] to [5edfa14c10].
︙ | ︙ | |||
69 70 71 72 73 74 75 | - initWithFile: (OFString *)path { self = [super init]; @try { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; OFData *data = [OFData dataWithContentsOfFile: path]; | | | | | | 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 | - initWithFile: (OFString *)path { self = [super init]; @try { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; OFData *data = [OFData dataWithContentsOfFile: path]; const unsigned char *dataItems = data.items; _certificate = d2i_X509(NULL, &dataItems, 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 = [super init]; @try { _certificate = X509_dup(certificate); if (_certificate == NULL) @throw [OFInitializationFailedException exceptionWithClass: self.class]; } @catch (id e) { [self release]; @throw e; } return self; } |
︙ | ︙ | |||
116 117 118 119 120 121 122 | X509_free(_certificate); [super dealloc]; } - (OFString *)description { | | > > > > | | | | < < > | 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 | X509_free(_certificate); [super dealloc]; } - (OFString *)description { OFString *issuer = [self.issuer.description stringByReplacingOccurrencesOfString: @"\n" withString: @"\n\t"]; return [OFString stringWithFormat: @"<%@\n" @"\tIssuer: %@\n" @"\tSubject: %@\n" @"\tSANs: %@\n" @">", self.class, issuer, self.subject, self.subjectAlternativeName]; } - (OFDictionary *)issuer { X509_NAME *name; if (_issuer != nil) |
︙ | ︙ | |||
313 314 315 316 317 318 319 | } - (bool)hasSRVNameMatchingDomain: (OFString *)domain service: (OFString *)service { size_t serviceLength; OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; | | | | | | 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 | } - (bool)hasSRVNameMatchingDomain: (OFString *)domain service: (OFString *)service { size_t serviceLength; OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; OFDictionary *SANs = self.subjectAlternativeName; OFList *assertedNames = [[SANs objectForKey: @"otherName"] objectForKey: OID_SRVName]; if (![service hasPrefix: @"_"]) service = [service stringByPrependingString: @"_"]; service = [service stringByAppendingString: @"."]; serviceLength = service.length; for (OFString *name in assertedNames) { if ([name hasPrefix: service]) { OFString *asserted; asserted = [name substringWithRange: of_range( serviceLength, name.length - serviceLength)]; if ([self X509_isAssertedDomain: asserted equalDomain: domain]) { [pool release]; return true; } } } |
︙ | ︙ | |||
359 360 361 362 363 364 365 | if ([asserted caseInsensitiveCompare: domain] == OF_ORDERED_SAME) return true; if (![asserted hasPrefix: @"*."]) return false; asserted = [asserted substringWithRange: | | | | 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 | if ([asserted caseInsensitiveCompare: domain] == OF_ORDERED_SAME) return true; if (![asserted hasPrefix: @"*."]) return false; asserted = [asserted substringWithRange: of_range(2, asserted.length - 2)]; firstDot = [domain rangeOfString: @"."].location; if (firstDot == OF_NOT_FOUND) return false; domain = [domain substringWithRange: of_range(firstDot + 1, domain.length - firstDot - 1)]; if (![asserted caseInsensitiveCompare: domain]) return true; return false; } |
︙ | ︙ | |||
475 476 477 478 479 480 481 | [_string release]; [super dealloc]; } - (OFString *)description { char tmp[1024]; | | | | 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 | [_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: [X509OID class]]) { X509OID *OID = object; return [OID->_string isEqual: _string]; } if ([object isKindOfClass: [OFString class]]) return [_string isEqual: object]; return false; } - (uint32_t)hash { return _string.hash; } - copy { return [self retain]; } @end |