diff --git a/src/SSLSocket.m b/src/SSLSocket.m index 6c50c54..d8633bf 100644 --- a/src/SSLSocket.m +++ b/src/SSLSocket.m @@ -1,5 +1,6 @@ /* - * Copyright (c) 2011, 2012, 2013, 2014, Jonathan Schleifer + * Copyright (c) 2011, 2012, 2013, 2014, 2015 + * Jonathan Schleifer * Copyright (c) 2011, Florian Zeitz * Copyright (c) 2011, Jos Kuijpers * @@ -32,6 +33,7 @@ #import #import #import +#import #import #import @@ -41,6 +43,7 @@ #import #import #import + #import #import @@ -149,7 +152,7 @@ locking_callback(int mode, int n, const char *file, int line) SSL_set_connect_state(_SSL); - encoding = [OFString nativeOSEncoding]; + encoding = [OFSystemInfo native8BitEncoding]; if ((_privateKeyFile != nil && !SSL_use_PrivateKey_file(_SSL, [_privateKeyFile cStringWithEncoding: encoding], @@ -190,7 +193,8 @@ locking_callback(int mode, int n, const char *file, int line) SSL_set_accept_state(client->_SSL); - encoding = [OFString nativeOSEncoding]; + encoding = [OFSystemInfo native8BitEncoding]; + if (!SSL_use_PrivateKey_file(client->_SSL, [_privateKeyFile cStringWithEncoding: encoding], SSL_FILETYPE_PEM) || !SSL_use_certificate_file(client->_SSL,