Skip to content

OMNI-102245:Concurrent calls to port 9190 fails when FIPS enabled #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
SANKARPITCHAIKANI wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

OMNI-102245:Concurrent calls to port 9190 fails when FIPS enabled #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 22 additions & 5 deletions lib/cpp/src/thrift/transport/TSSLSocket.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,14 @@ static unsigned long callbackThreadID() {
return (unsigned long)pthread_self();
#endif
}
#else
static void currentThreadID(CRYPTO_THREADID *threadid) {
#ifdef _WIN32
CRYPTO_THREADID_set_numeric(threadid, (unsigned long)GetCurrentThreadId());
#else
CRYPTO_THREADID_set_numeric(threadid, (unsigned long)pthread_self());
#endif
}
#endif

static CRYPTO_dynlock_value* dyn_create(const char*, int) {
Expand Down Expand Up @@ -126,16 +134,25 @@ void initializeOpenSSL() {
mutexes = boost::shared_array<Mutex>(new Mutex[ ::CRYPTO_num_locks()]);
#endif

// OpenSSL 1.0.0 and above the CRYPTO_set_id_callback API is deprecated and
// changed to CRYPTO_THREADID_set_callback
#if (OPENSSL_VERSION_NUMBER < OPENSSL_VERSION_NO_THREAD_ID_BEFORE)
CRYPTO_set_id_callback(callbackThreadID);
#else
CRYPTO_THREADID_set_callback(currentThreadID);
#endif

CRYPTO_set_locking_callback(callbackLocking);
if (!CRYPTO_get_locking_callback())
{
CRYPTO_set_locking_callback(callbackLocking);
}

// dynamic locking
CRYPTO_set_dynlock_create_callback(dyn_create);
CRYPTO_set_dynlock_lock_callback(dyn_lock);
CRYPTO_set_dynlock_destroy_callback(dyn_destroy);
if (!CRYPTO_get_dynlock_create_callback()) {
// dynamic locking
CRYPTO_set_dynlock_create_callback(dyn_create);
CRYPTO_set_dynlock_lock_callback(dyn_lock);
CRYPTO_set_dynlock_destroy_callback(dyn_destroy);
}
}

void cleanupOpenSSL() {
Expand Down