From 4773af8f2f60fd3696973fdf0890e4380590cb90 Mon Sep 17 00:00:00 2001 From: Benjamin Sergeant Date: Fri, 8 May 2020 09:54:42 -0700 Subject: [PATCH] (openssl tls) (openssl < 1.1) logic inversion - crypto locking callback are not registered properly --- docs/CHANGELOG.md | 4 ++++ ixwebsocket/IXSocketOpenSSL.cpp | 2 +- ixwebsocket/IXWebSocketVersion.h | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 746f0658..f6e17d67 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,6 +1,10 @@ # Changelog All changes to this project will be documented in this file. +## [9.5.8] - 2020-05-08 + +(openssl tls) (openssl < 1.1) logic inversion - crypto locking callback are not registered properly + ## [9.5.7] - 2020-05-08 (cmake) default TLS back to mbedtls on Windows Universal Platform diff --git a/ixwebsocket/IXSocketOpenSSL.cpp b/ixwebsocket/IXSocketOpenSSL.cpp index b678397a..a504a5cb 100644 --- a/ixwebsocket/IXSocketOpenSSL.cpp +++ b/ixwebsocket/IXSocketOpenSSL.cpp @@ -109,7 +109,7 @@ namespace ix #else (void) OPENSSL_config(nullptr); - if (CRYPTO_get_locking_callback() != nullptr) + if (CRYPTO_get_locking_callback() == nullptr) { CRYPTO_set_locking_callback(SocketOpenSSL::openSSLLockingCallback); } diff --git a/ixwebsocket/IXWebSocketVersion.h b/ixwebsocket/IXWebSocketVersion.h index cc4b859a..dc2d0282 100644 --- a/ixwebsocket/IXWebSocketVersion.h +++ b/ixwebsocket/IXWebSocketVersion.h @@ -6,4 +6,4 @@ #pragma once -#define IX_WEBSOCKET_VERSION "9.5.7" +#define IX_WEBSOCKET_VERSION "9.5.8"