[THRIFT-3878] Compile error in TSSLSocket.cpp with new OpenSSL [CRYPTO_num_locks]

• Type: Bug
• Status: Closed
• Priority: Trivial
• Resolution: Fixed
• Affects Version/s: 0.9.3, 0.10.0
• Fix Version/s: 0.10.0
• Component/s: C++ - Library

Environment

VS2013
Thrift from git repo, SHA-1: 5a3f855b4e6882184f13c698855c877241144a12 (master)
OpenSSL from git repo (master).

• Assignee: James E. King III
• Reporter: Sergey Fasman
• Created: 15/Jul/16 06:05
• Updated: 01/Dec/16 03:35
• Resolved: 01/Oct/16 15:01

Description

In TSSLSocket if use new OpenSSL library (downloaded and builded from git) will be compile error.
That because CRYPTO_num_locks is now macro-call instead of function.
THRIFT -also from git repo (master).

So I simply fix that:

#ifdef CRYPTO_num_locks
mutexes = boost::shared_array<Mutex>(new Mutex[CRYPTO_num_locks()]);
#else
mutexes = boost::shared_array<Mutex>(new Mutex[ ::CRYPTO_num_locks()]);
#endif

Issue Links

• relates to: THRIFT-3736 C++ library build fails if OpenSSL does not surrpot SSLv3
• links to: GitHub Pull Request #1102