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

Adjust to ObjFW changes

Browse source
This commit is contained in:
Jonathan Schleifer 2014-06-03 21:22:27 +02:00
parent 89630e5a13
commit 5031d03707
1 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/SSLSocket.m
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2011, 2012, 2013, Jonathan Schleifer <js@webkeks.org> * Copyright (c) 2011, 2012, 2013, 2014, Jonathan Schleifer <js@webkeks.org>
* Copyright (c) 2011, Florian Zeitz <florob@babelmonkeys.de> * Copyright (c) 2011, Florian Zeitz <florob@babelmonkeys.de>
* Copyright (c) 2011, Jos Kuijpers <jos@kuijpersvof.nl> * Copyright (c) 2011, Jos Kuijpers <jos@kuijpersvof.nl>
* *
@ -137,7 +137,8 @@ locking_callback(int mode, int n, const char *file, int line)
- (void)startTLS - (void)startTLS
{ {
of_string_encoding_t encoding = [OFString nativeOSEncoding]; of_string_encoding_t encoding;
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,6 +149,8 @@ locking_callback(int mode, int n, const char *file, int line)
SSL_set_connect_state(_SSL); SSL_set_connect_state(_SSL);
encoding = [OFString nativeOSEncoding];
if ((_privateKeyFile != nil && !SSL_use_PrivateKey_file(_SSL, if ((_privateKeyFile != nil && !SSL_use_PrivateKey_file(_SSL,
[_privateKeyFile cStringWithEncoding: encoding], [_privateKeyFile cStringWithEncoding: encoding],
SSL_FILETYPE_PEM)) || (_certificateFile != nil && SSL_FILETYPE_PEM)) || (_certificateFile != nil &&
@ -173,8 +176,8 @@ 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];
of_string_encoding_t encoding;
if ((client->_SSL = SSL_new(ctx)) == NULL || if ((client->_SSL = SSL_new(ctx)) == NULL ||
!SSL_set_fd(client->_SSL, client->_socket)) { !SSL_set_fd(client->_SSL, client->_socket)) {
@ -187,6 +190,7 @@ locking_callback(int mode, int n, const char *file, int line)
SSL_set_accept_state(client->_SSL); SSL_set_accept_state(client->_SSL);
encoding = [OFString nativeOSEncoding];
if (!SSL_use_PrivateKey_file(client->_SSL, [_privateKeyFile if (!SSL_use_PrivateKey_file(client->_SSL, [_privateKeyFile
cStringWithEncoding: encoding], cStringWithEncoding: encoding],
SSL_FILETYPE_PEM) || !SSL_use_certificate_file(client->_SSL, SSL_FILETYPE_PEM) || !SSL_use_certificate_file(client->_SSL,
@ -226,7 +230,7 @@ locking_callback(int mode, int n, const char *file, int line)
if (_atEndOfStream) { if (_atEndOfStream) {
OFReadFailedException *e; OFReadFailedException *e;
e = [OFReadFailedException exceptionWithStream: self e = [OFReadFailedException exceptionWithObject: self
requestedLength: length]; requestedLength: length];
#ifndef _WIN32 #ifndef _WIN32
e->_errNo = ENOTCONN; e->_errNo = ENOTCONN;
@ -238,10 +242,10 @@ locking_callback(int mode, int n, const char *file, int line)
} }
if ((ret = SSL_read(_SSL, buffer, (int)length)) < 0) { if ((ret = SSL_read(_SSL, buffer, (int)length)) < 0) {
if (SSL_get_error(_SSL, ret) == SSL_ERROR_WANT_READ) if (SSL_get_error(_SSL, ret) == SSL_ERROR_WANT_READ)
return 0; return 0;
@throw [OFReadFailedException exceptionWithStream: self @throw [OFReadFailedException exceptionWithObject: self
requestedLength: length]; requestedLength: length];
} }
@ -263,7 +267,7 @@ locking_callback(int mode, int n, const char *file, int line)
if (_atEndOfStream) { if (_atEndOfStream) {
OFWriteFailedException *e; OFWriteFailedException *e;
e = [OFWriteFailedException exceptionWithStream: self e = [OFWriteFailedException exceptionWithObject: self
requestedLength: length]; requestedLength: length];
#ifndef _WIN32 #ifndef _WIN32
@ -276,16 +280,16 @@ locking_callback(int mode, int n, const char *file, int line)
} }
if (SSL_write(_SSL, buffer, (int)length) < length) if (SSL_write(_SSL, buffer, (int)length) < length)
@throw [OFWriteFailedException exceptionWithStream: self @throw [OFWriteFailedException exceptionWithObject: self
requestedLength: length]; requestedLength: length];
} }
- (size_t)numberOfBytesInReadBuffer - (bool)hasDataInReadBuffer
{ {
if (_SSL == NULL) if (_SSL != NULL && SSL_pending(_SSL) > 0)
return [super numberOfBytesInReadBuffer]; return true;
return [super numberOfBytesInReadBuffer] + SSL_pending(_SSL); return [super hasDataInReadBuffer];
} }
- (void)setDelegate: (id <OFTLSSocketDelegate>)delegate - (void)setDelegate: (id <OFTLSSocketDelegate>)delegate