Overview
| Comment: | Adjust to recent ObjFW changes. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
41b938d3573740dce0094dfcfe977456 |
| User & Date: | florob@babelmonkeys.de on 2013-01-12 22:46:13 |
| Other Links: | manifest | tags |
Context
|
2013-01-18
| ||
| 23:33 | Make it possible to request client certificates. check-in: f0a40268e4 user: js tags: trunk | |
|
2013-01-12
| ||
| 22:46 | Adjust to recent ObjFW changes. check-in: 41b938d357 user: florob@babelmonkeys.de tags: trunk | |
|
2012-12-19
| ||
| 21:59 | Adjust to recent ObjFW changes. check-in: 20cb421460 user: js tags: trunk | |
Changes
Modified src/SSLSocket.m from [87768a98f4] to [28c8d23958].
| ︙ | ︙ | |||
140 141 142 143 144 145 146 | @throw [OFInitializationFailedException exceptionWithClass: [self class]]; } SSL_set_connect_state(ssl); if ((privateKeyFile != nil && !SSL_use_PrivateKey_file(ssl, | | | | 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 |
@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(sock);
sock = INVALID_SOCKET;
@throw [OFInitializationFailedException
exceptionWithClass: [self class]];
}
|
| ︙ | ︙ | |||
190 191 192 193 194 195 196 | host: host port: port]; } SSL_set_connect_state(ssl); if ((privateKeyFile != nil && !SSL_use_PrivateKey_file(ssl, | | | | 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 |
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];
|
| ︙ | ︙ | |||
222 223 224 225 226 227 228 | @throw [OFAcceptFailedException exceptionWithClass: [self class] socket: self]; } SSL_set_accept_state(newSocket->ssl); if (!SSL_use_PrivateKey_file(newSocket->ssl, [privateKeyFile | | | | 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 |
@throw [OFAcceptFailedException exceptionWithClass: [self class]
socket: self];
}
SSL_set_accept_state(newSocket->ssl);
if (!SSL_use_PrivateKey_file(newSocket->ssl, [privateKeyFile
cStringWithEncoding: OF_STRING_ENCODING_NATIVE],
SSL_FILETYPE_PEM) || !SSL_use_certificate_file(newSocket->ssl,
[certificateFile cStringWithEncoding: OF_STRING_ENCODING_NATIVE],
SSL_FILETYPE_PEM) || SSL_accept(newSocket->ssl) != 1) {
/* We only want to close the OFTCPSocket */
object_setClass(newSocket, [OFTCPSocket class]);
[newSocket close];
object_setClass(newSocket, object_getClass(self));
@throw [OFAcceptFailedException exceptionWithClass: [self class]
|
| ︙ | ︙ |