From 4f0394a0f419ca13c593e02ca31c2063bdd78359 Mon Sep 17 00:00:00 2001 From: Kevin Zheng Date: Wed, 15 Aug 2018 20:37:33 -0700 Subject: [PATCH 1/2] Update gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 1f2fcc1bce4..c85a730df56 100644 --- a/.gitignore +++ b/.gitignore @@ -7,9 +7,10 @@ asio/ local/ indent.sh *.pdb -*.sln *.sdf +*.sln *.suo +*.swp *.aps *.vcxproj *.vcxproj.* From a78cff3dc5a8032b4d2ceadcc378cc6e8649b64e Mon Sep 17 00:00:00 2001 From: Kevin Zheng Date: Tue, 18 Dec 2018 11:53:15 -0800 Subject: [PATCH 2/2] Fix build with OpenSSL 1.1.1a OpenSSL 1.1.1a replaces the CRYPTO_get_locking_callback() function with a macro definition to (NULL). --- src/SSL.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/SSL.cpp b/src/SSL.cpp index 7f7e812117a..c40fa72e1b1 100644 --- a/src/SSL.cpp +++ b/src/SSL.cpp @@ -29,8 +29,7 @@ void MumbleSSL::initialize() { // If we detect that no locking callback is configured, we // have to set it up ourselves to allow multi-threaded use // of OpenSSL. - void *lockcb = reinterpret_cast(CRYPTO_get_locking_callback()); - if (lockcb == NULL) { + if (CRYPTO_get_locking_callback() == NULL) { SSLLocks::initialize(); } }