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

Adjust to recent ObjFW changes.

Browse source
This commit is contained in:
Jonathan Schleifer 2012-12-19 22:59:32 +01:00
parent dd6076f1af
commit 20253c05c6
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/SSLSocket.m
View file

@ -144,10 +144,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: [privateKeyFile cStringUsingEncoding:
OF_STRING_ENCODING_NATIVE], SSL_FILETYPE_PEM)) || OF_STRING_ENCODING_NATIVE], SSL_FILETYPE_PEM)) ||
(certificateFile != nil && !SSL_use_certificate_file(ssl, (certificateFile != nil && !SSL_use_certificate_file(ssl,
[certificateFile cStringWithEncoding: [certificateFile cStringUsingEncoding:
OF_STRING_ENCODING_NATIVE], SSL_FILETYPE_PEM)) || OF_STRING_ENCODING_NATIVE], SSL_FILETYPE_PEM)) ||
SSL_connect(ssl) != 1) { SSL_connect(ssl) != 1) {
close(sock); close(sock);
@ -194,10 +194,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 cStringUsingEncoding: OF_STRING_ENCODING_NATIVE],
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], cStringUsingEncoding: OF_STRING_ENCODING_NATIVE],
SSL_FILETYPE_PEM)) || SSL_connect(ssl) != 1) { SSL_FILETYPE_PEM)) || SSL_connect(ssl) != 1) {
[super close]; [super close];
@throw [OFConnectionFailedException @throw [OFConnectionFailedException
@ -226,9 +226,9 @@ locking_callback(int mode, int n, const char *file, int line)
SSL_set_accept_state(newSocket->ssl); SSL_set_accept_state(newSocket->ssl);
if (!SSL_use_PrivateKey_file(newSocket->ssl, [privateKeyFile if (!SSL_use_PrivateKey_file(newSocket->ssl, [privateKeyFile
cStringWithEncoding: OF_STRING_ENCODING_NATIVE], cStringUsingEncoding: OF_STRING_ENCODING_NATIVE],
SSL_FILETYPE_PEM) || !SSL_use_certificate_file(newSocket->ssl, SSL_FILETYPE_PEM) || !SSL_use_certificate_file(newSocket->ssl,
[certificateFile cStringWithEncoding: OF_STRING_ENCODING_NATIVE], [certificateFile cStringUsingEncoding: OF_STRING_ENCODING_NATIVE],
SSL_FILETYPE_PEM) || SSL_accept(newSocket->ssl) != 1) { SSL_FILETYPE_PEM) || SSL_accept(newSocket->ssl) != 1) {
/* We only want to close the OFTCPSocket */ /* We only want to close the OFTCPSocket */
object_setClass(newSocket, [OFTCPSocket class]); object_setClass(newSocket, [OFTCPSocket class]);
@ -375,8 +375,8 @@ locking_callback(int mode, int n, const char *file, int line)
} }
data = [OFDataArray dataArray]; data = [OFDataArray dataArray];
[data addItemsFromCArray: buffer [data addItems: buffer
count: length]; count: length];
return data; return data;
} }

2
src/X509Certificate.m
View file

@ -50,7 +50,7 @@
mode: @"r"]; mode: @"r"];
OFDataArray *data = [fd readDataArrayTillEndOfStream]; OFDataArray *data = [fd readDataArrayTillEndOfStream];
[fd close]; [fd close];
const unsigned char *dataCArray = [data cArray]; const unsigned char *dataCArray = [data items];
crt = d2i_X509(NULL, &dataCArray, [data count]); crt = d2i_X509(NULL, &dataCArray, [data count]);
[pool release]; [pool release];
if (crt == NULL) if (crt == NULL)