From 2ef21324448a52fdd22bc3b48d50a9d21ec3fd97 Mon Sep 17 00:00:00 2001 From: Jonathan Schleifer Date: Tue, 1 Aug 2017 21:03:59 +0200 Subject: [PATCH] Fix compilation with GCC --- src/SSLConnectionFailedException.h | 4 ++-- src/SSLSocket.h | 1 + src/SSLSocket.m | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/SSLConnectionFailedException.h b/src/SSLConnectionFailedException.h index 07d1fbc..5b2297d 100644 --- a/src/SSLConnectionFailedException.h +++ b/src/SSLConnectionFailedException.h @@ -53,10 +53,10 @@ OF_ASSUME_NONNULL_BEGIN verifyResult: (long)verifyResult; - initWithHost: (OFString *)host port: (uint16_t)port - socket: (SSLSocket *)socket OF_UNAVAILABLE; + socket: (id)socket OF_UNAVAILABLE; - initWithHost: (OFString *)host port: (uint16_t)port - socket: (SSLSocket *)socket + socket: (id)socket errNo: (int)errNo OF_UNAVAILABLE; - initWithHost: (OFString *)host port: (uint16_t)port diff --git a/src/SSLSocket.h b/src/SSLSocket.h index 43a4ce9..c562a77 100644 --- a/src/SSLSocket.h +++ b/src/SSLSocket.h @@ -33,6 +33,7 @@ OF_ASSUME_NONNULL_BEGIN @interface SSLSocket: OFTCPSocket { SSL *_SSL; + id _delegate; OFString *_certificateFile, *_privateKeyFile; const char *_privateKeyPassphrase; bool _certificateVerificationEnabled; diff --git a/src/SSLSocket.m b/src/SSLSocket.m index 3633664..6ca959e 100644 --- a/src/SSLSocket.m +++ b/src/SSLSocket.m @@ -97,7 +97,7 @@ locking_callback(int mode, int n, const char *file, int line) @implementation SSLSocket @synthesize delegate = _delegate, certificateFile = _certificateFile; @synthesize privateKeyFile = _privateKeyFile; -@synthesize privateKeyPassphrase = privateKeyPassphrase; +@synthesize privateKeyPassphrase = _privateKeyPassphrase; @synthesize certificateVerificationEnabled = _certificateVerificationEnabled; @synthesize requestClientCertificatesEnabled = _requestClientCertificatesEnabled;