Overview
| Comment: | Adjust to ObjFW changes |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
43001c3544ea223458c68b17541e0798 |
| User & Date: | js on 2017-01-10 23:56:09 |
| Other Links: | manifest | tags |
Context
|
2017-04-15
| ||
| 19:37 | Fix URL in copyright headers check-in: e3dcc5816e user: js tags: trunk | |
|
2017-01-10
| ||
| 23:56 | Adjust to ObjFW changes check-in: 43001c3544 user: js tags: trunk | |
|
2016-07-09
| ||
| 21:31 | Move some files to build-aux check-in: 0649158fd6 user: js tags: trunk | |
Changes
Modified src/SSLSocket.m from [3b375c6852] to [119d9c726e].
| ︙ | ︙ | |||
40 41 42 43 44 45 46 | #if defined(__clang__) # pragma clang diagnostic pop #endif #import <ObjFW/OFThread.h> #import <ObjFW/OFHTTPRequest.h> #import <ObjFW/OFDataArray.h> | | | 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 | #if defined(__clang__) # pragma clang diagnostic pop #endif #import <ObjFW/OFThread.h> #import <ObjFW/OFHTTPRequest.h> #import <ObjFW/OFDataArray.h> #import <ObjFW/OFLocalization.h> #import <ObjFW/OFAcceptFailedException.h> #import <ObjFW/OFInitializationFailedException.h> #import <ObjFW/OFInvalidArgumentException.h> #import <ObjFW/OFNotOpenException.h> #import <ObjFW/OFOutOfRangeException.h> #import <ObjFW/OFReadFailedException.h> |
| ︙ | ︙ | |||
209 210 211 212 213 214 215 | } SSL_set_verify(_SSL, SSL_VERIFY_PEER, NULL); } SSL_set_connect_state(_SSL); | | | 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 |
}
SSL_set_verify(_SSL, SSL_VERIFY_PEER, NULL);
}
SSL_set_connect_state(_SSL);
encoding = [OFLocalization 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))) {
|
| ︙ | ︙ | |||
284 285 286 287 288 289 290 | } if (_requestClientCertificatesEnabled) SSL_set_verify(client->_SSL, SSL_VERIFY_PEER, NULL); SSL_set_accept_state(client->_SSL); | | | 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 |
}
if (_requestClientCertificatesEnabled)
SSL_set_verify(client->_SSL, SSL_VERIFY_PEER, NULL);
SSL_set_accept_state(client->_SSL);
encoding = [OFLocalization encoding];
if (!SSL_use_PrivateKey_file(client->_SSL, [_privateKeyFile
cStringWithEncoding: encoding],
SSL_FILETYPE_PEM) || !SSL_use_certificate_file(client->_SSL,
[_certificateFile cStringWithEncoding: encoding],
SSL_FILETYPE_PEM) || SSL_accept(client->_SSL) != 1) {
[client SSL_super_close];
|
| ︙ | ︙ |