wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Switch to BoringSSL by default

This commit is contained in:
Russell Sears 2020-12-09 13:37:48 -08:00
parent b62406fb48
commit 589eaf54d7
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/Dockerfile
View File

@ -79,7 +79,7 @@ RUN cd /opt/ && curl -L https://github.com/facebook/rocksdb/archive/v6.10.1.tar.
RUN cd /opt/ && curl -L https://github.com/manticoresoftware/manticoresearch/raw/master/misc/junit/ctest2junit.xsl -o ctest2junit.xsl RUN cd /opt/ && curl -L https://github.com/manticoresoftware/manticoresearch/raw/master/misc/junit/ctest2junit.xsl -o ctest2junit.xsl
# Setting this environment variable switches from OpenSSL to BoringSSL # Setting this environment variable switches from OpenSSL to BoringSSL
#ENV OPENSSL_ROOT_DIR=/opt/boringssl ENV OPENSSL_ROOT_DIR=/opt/boringssl
# install BoringSSL: TODO: They don't seem to have releases(?) I picked today's master SHA. # install BoringSSL: TODO: They don't seem to have releases(?) I picked today's master SHA.
RUN cd /opt &&\ RUN cd /opt &&\

8
flow/TLSConfig.actor.cpp
View File

@ -28,9 +28,7 @@ TLSPolicy::~TLSPolicy() {}
namespace TLS { namespace TLS {
void DisableOpenSSLAtExitHandler() { void DisableOpenSSLAtExitHandler() {
#ifdef TLS_DISABLED #ifdef HAVE_OPENSSL_INIT_NO_ATEXIT
return;
#else
static bool once = false; static bool once = false;
if (!once) { if (!once) {
once = true; once = true;
@ -43,9 +41,7 @@ void DisableOpenSSLAtExitHandler() {
} }
void DestroyOpenSSLGlobalState() { void DestroyOpenSSLGlobalState() {
#ifdef TLS_DISABLED #ifdef HAVE_OPENSSL_INIT_NO_ATEXIT
return;
#else
OPENSSL_cleanup(); OPENSSL_cleanup();
#endif #endif
} }