ObjFW/ObjOpenSSL
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Adapt to ObjFW changes

Browse source
This commit is contained in:
Florian Zeitz 2014-02-03 18:31:57 +01:00
parent e763339789
commit 89630e5a13
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/SSLSocket.m
View file

@ -137,6 +137,7 @@ locking_callback(int mode, int n, const char *file, int line)
- (void)startTLS - (void)startTLS
{ {
of_string_encoding_t encoding = [OFString nativeOSEncoding];
if ((_SSL = SSL_new(ctx)) == NULL || !SSL_set_fd(_SSL, _socket)) { if ((_SSL = SSL_new(ctx)) == NULL || !SSL_set_fd(_SSL, _socket)) {
[super close]; [super close];
@throw [OFConnectionFailedException @throw [OFConnectionFailedException
@ -148,10 +149,10 @@ locking_callback(int mode, int n, const char *file, int line)
SSL_set_connect_state(_SSL); SSL_set_connect_state(_SSL);
if ((_privateKeyFile != nil && !SSL_use_PrivateKey_file(_SSL, if ((_privateKeyFile != nil && !SSL_use_PrivateKey_file(_SSL,
[_privateKeyFile cStringWithEncoding: OF_STRING_ENCODING_NATIVE], [_privateKeyFile cStringWithEncoding: encoding],
SSL_FILETYPE_PEM)) || (_certificateFile != nil && SSL_FILETYPE_PEM)) || (_certificateFile != nil &&
!SSL_use_certificate_file(_SSL, [_certificateFile !SSL_use_certificate_file(_SSL, [_certificateFile
cStringWithEncoding: OF_STRING_ENCODING_NATIVE], cStringWithEncoding: encoding],
SSL_FILETYPE_PEM)) || SSL_connect(_SSL) != 1) { SSL_FILETYPE_PEM)) || SSL_connect(_SSL) != 1) {
[super close]; [super close];
@throw [OFConnectionFailedException @throw [OFConnectionFailedException
@ -172,6 +173,7 @@ locking_callback(int mode, int n, const char *file, int line)
- (instancetype)accept - (instancetype)accept
{ {
of_string_encoding_t encoding = [OFString nativeOSEncoding];
SSLSocket *client = (SSLSocket*)[super accept]; SSLSocket *client = (SSLSocket*)[super accept];
if ((client->_SSL = SSL_new(ctx)) == NULL || if ((client->_SSL = SSL_new(ctx)) == NULL ||
@ -186,9 +188,9 @@ locking_callback(int mode, int n, const char *file, int line)
SSL_set_accept_state(client->_SSL); SSL_set_accept_state(client->_SSL);
if (!SSL_use_PrivateKey_file(client->_SSL, [_privateKeyFile if (!SSL_use_PrivateKey_file(client->_SSL, [_privateKeyFile
cStringWithEncoding: OF_STRING_ENCODING_NATIVE], cStringWithEncoding: encoding],
SSL_FILETYPE_PEM) || !SSL_use_certificate_file(client->_SSL, SSL_FILETYPE_PEM) || !SSL_use_certificate_file(client->_SSL,
[_certificateFile cStringWithEncoding: OF_STRING_ENCODING_NATIVE], [_certificateFile cStringWithEncoding: encoding],
SSL_FILETYPE_PEM) || SSL_accept(client->_SSL) != 1) { SSL_FILETYPE_PEM) || SSL_accept(client->_SSL) != 1) {
[client SSL_super_close]; [client SSL_super_close];
@throw [OFAcceptFailedException exceptionWithSocket: self]; @throw [OFAcceptFailedException exceptionWithSocket: self];