From 46d6155c3e32133f17257c60278422364194bda5 Mon Sep 17 00:00:00 2001 From: Igor Sugak Date: Thu, 28 Sep 2017 23:35:24 -0700 Subject: [PATCH] delete deprecated SSLContext::setSSLLockTypes Summary: This is deprecated and not used. Reviewed By: yfeldblum Differential Revision: D5936286 fbshipit-source-id: 68f757be06ebe375e14db008d0e5828fad0c3aa5 --- folly/io/async/SSLContext.cpp | 4 ---- folly/io/async/SSLContext.h | 23 ----------------------- 2 files changed, 27 deletions(-) diff --git a/folly/io/async/SSLContext.cpp b/folly/io/async/SSLContext.cpp index aee7ec75..d0134178 100644 --- a/folly/io/async/SSLContext.cpp +++ b/folly/io/async/SSLContext.cpp @@ -625,10 +625,6 @@ int SSLContext::passwordCallback(char* password, return int(length); } -void SSLContext::setSSLLockTypes(std::map inLockTypes) { - folly::ssl::setLockTypes(inLockTypes); -} - #if defined(SSL_MODE_HANDSHAKE_CUTTHROUGH) void SSLContext::enableFalseStart() { SSL_CTX_set_mode(ctx_, SSL_MODE_HANDSHAKE_CUTTHROUGH); diff --git a/folly/io/async/SSLContext.h b/folly/io/async/SSLContext.h index 4e507714..c8db033e 100644 --- a/folly/io/async/SSLContext.h +++ b/folly/io/async/SSLContext.h @@ -462,29 +462,6 @@ class SSLContext { return ctx_; } - /** - * Set preferences for how to treat locks in OpenSSL. This must be - * called before the instantiation of any SSLContext objects, otherwise - * the defaults will be used. - * - * OpenSSL has a lock for each module rather than for each object or - * data that needs locking. Some locks protect only refcounts, and - * might be better as spinlocks rather than mutexes. Other locks - * may be totally unnecessary if the objects being protected are not - * shared between threads in the application. - * - * By default, all locks are initialized as mutexes. OpenSSL's lock usage - * may change from version to version and you should know what you are doing - * before disabling any locks entirely. - * - * Example: if you don't share SSL sessions between threads in your - * application, you may be able to do this - * - * setSSLLockTypes({{CRYPTO_LOCK_SSL_SESSION, SSLContext::LOCK_NONE}}) - */ - FOLLY_DEPRECATED("Use folly::ssl::setLockTypes") - static void setSSLLockTypes(std::map lockTypes); - /** * Examine OpenSSL's error stack, and return a string description of the * errors. -- 2.34.1