Merge 379e65800c
into d11fe7ad01
This commit is contained in:
commit
25f2fc7c47
1 changed files with 8 additions and 1 deletions
|
@ -70,6 +70,10 @@
|
||||||
static SSL_CTX *ctx;
|
static SSL_CTX *ctx;
|
||||||
static of_mutex_t *ssl_mutexes;
|
static of_mutex_t *ssl_mutexes;
|
||||||
|
|
||||||
|
#if defined(__clang__)
|
||||||
|
# pragma clang diagnostic push
|
||||||
|
# pragma clang diagnostic ignored "-Wunused-function"
|
||||||
|
#endif
|
||||||
static unsigned long
|
static unsigned long
|
||||||
get_thread_id(void)
|
get_thread_id(void)
|
||||||
{
|
{
|
||||||
|
@ -89,6 +93,9 @@ locking_callback(int mode, int n, const char *file, int line)
|
||||||
else
|
else
|
||||||
of_mutex_unlock(&ssl_mutexes[n]);
|
of_mutex_unlock(&ssl_mutexes[n]);
|
||||||
}
|
}
|
||||||
|
#if defined(__clang__)
|
||||||
|
# pragma clang diagnostic pop
|
||||||
|
#endif
|
||||||
|
|
||||||
@implementation SSLSocket
|
@implementation SSLSocket
|
||||||
@synthesize delegate = _delegate, certificateFile = _certificateFile;
|
@synthesize delegate = _delegate, certificateFile = _certificateFile;
|
||||||
|
@ -126,7 +133,7 @@ locking_callback(int mode, int n, const char *file, int line)
|
||||||
@throw [OFInitializationFailedException
|
@throw [OFInitializationFailedException
|
||||||
exceptionWithClass: self];
|
exceptionWithClass: self];
|
||||||
|
|
||||||
if ((SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2) & SSL_OP_NO_SSLv2) == 0)
|
if ((SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2) & SSL_OP_NO_SSLv2) != SSL_OP_NO_SSLv2)
|
||||||
@throw [OFInitializationFailedException
|
@throw [OFInitializationFailedException
|
||||||
exceptionWithClass: self];
|
exceptionWithClass: self];
|
||||||
|
|
||||||
|
|
Reference in a new issue