kapitan/IXWebSocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(openssl tls) (openssl < 1.1) logic inversion - crypto locking callback are not registered properly

Browse Source
This commit is contained in:
Benjamin Sergeant
2020-05-08 09:54:42 -07:00
parent c1403df74a
commit 4773af8f2f
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/CHANGELOG.md
View File

@@ -1,6 +1,10 @@
# Changelog # Changelog
All changes to this project will be documented in this file. 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 ## [9.5.7] - 2020-05-08
(cmake) default TLS back to mbedtls on Windows Universal Platform (cmake) default TLS back to mbedtls on Windows Universal Platform

2
ixwebsocket/IXSocketOpenSSL.cpp
View File

@@ -109,7 +109,7 @@ namespace ix
#else #else
(void) OPENSSL_config(nullptr); (void) OPENSSL_config(nullptr);
if (CRYPTO_get_locking_callback() != nullptr) if (CRYPTO_get_locking_callback() == nullptr)
{ {
CRYPTO_set_locking_callback(SocketOpenSSL::openSSLLockingCallback); CRYPTO_set_locking_callback(SocketOpenSSL::openSSLLockingCallback);
} }

2
ixwebsocket/IXWebSocketVersion.h
View File

@@ -6,4 +6,4 @@
#pragma once #pragma once
#define IX_WEBSOCKET_VERSION "9.5.7" #define IX_WEBSOCKET_VERSION "9.5.8"