Overview
| Comment: | Don't class-swizzle to call close on super. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
8a23146f8c72db0483e92c6f813aec49 |
| User & Date: | js on 2013-02-13 23:27:13 |
| Other Links: | manifest | tags |
Context
|
2013-02-14
| ||
| 02:20 | Add -Wdocumentation if supported by the compiler. check-in: 16a02009a3 user: js tags: trunk | |
|
2013-02-13
| ||
| 23:27 | Don't class-swizzle to call close on super. check-in: 8a23146f8c user: js tags: trunk | |
| 23:15 | Don't cache the description of exceptions. check-in: bc41772796 user: js tags: trunk | |
Changes
Modified src/SSLSocket.h from [ebcd9bc588] to [d1df87a4ff].
| ︙ | ︙ | |||
39 40 41 42 43 44 45 | @property BOOL requestsClientCertificates; #endif - initWithSocket: (OFTCPSocket*)socket; - initWithSocket: (OFTCPSocket*)socket privateKeyFile: (OFString*)privateKeyFile certificateFile: (OFString*)certificateFile; | | | | 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 | @property BOOL requestsClientCertificates; #endif - initWithSocket: (OFTCPSocket*)socket; - initWithSocket: (OFTCPSocket*)socket privateKeyFile: (OFString*)privateKeyFile certificateFile: (OFString*)certificateFile; - (void)SSL_super_close; - (SSLSocket*)accept; /* Changes the return type */ - (void)setPrivateKeyFile: (OFString*)file; - (OFString*)privateKeyFile; - (void)setCertificateFile: (OFString*)file; - (OFString*)certificateFile; - (void)setRequestsClientCertificates: (BOOL)enabled; - (BOOL)requestsClientCertificates; - (OFDataArray*)channelBindingDataWithType: (OFString*)type; - (X509Certificate*)peerCertificate; - (void)verifyPeerCertificate; @end |
Modified src/SSLSocket.m from [acf401502b] to [5ed521dab9].
| ︙ | ︙ | |||
211 212 213 214 215 216 217 |
- (SSLSocket*)accept
{
SSLSocket *client = (SSLSocket*)[super accept];
if ((client->_SSL = SSL_new(ctx)) == NULL ||
!SSL_set_fd(client->_SSL, client->_socket)) {
| < < | < < < < | < < > > > > > | 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 |
- (SSLSocket*)accept
{
SSLSocket *client = (SSLSocket*)[super accept];
if ((client->_SSL = SSL_new(ctx)) == NULL ||
!SSL_set_fd(client->_SSL, client->_socket)) {
[client SSL_super_close];
@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) {
[client SSL_super_close];
@throw [OFAcceptFailedException exceptionWithClass: [self class]
socket: self];
}
return client;
}
- (void)close
{
if (_SSL != NULL)
SSL_shutdown(_SSL);
[super close];
}
- (void)SSL_super_close
{
[super close];
}
- (size_t)lowlevelReadIntoBuffer: (void*)buffer
length: (size_t)length
{
ssize_t ret;
|
| ︙ | ︙ |