Browse Source

set openssl no_config before boost::asio:ssl

pull/1277/head
orignal 6 years ago
parent
commit
67f60f1889
  1. 24
      libi2pd/Crypto.cpp

24
libi2pd/Crypto.cpp

@ -1243,11 +1243,6 @@ namespace crypto @@ -1243,11 +1243,6 @@ namespace crypto
void InitCrypto (bool precomputation)
{
i2p::cpu::Detect ();
#if LEGACY_OPENSSL
OPENSSL_no_config ();
#else
OPENSSL_init_crypto (OPENSSL_INIT_NO_LOAD_CONFIG, NULL);
#endif
SSL_library_init ();
/* auto numLocks = CRYPTO_num_locks();
for (int i = 0; i < numLocks; i++)
@ -1283,3 +1278,22 @@ namespace crypto @@ -1283,3 +1278,22 @@ namespace crypto
}
}
}
// TODO: move to InitCrypto if boost::asio::ssl is not used anymore
// no_config must be called before SSL_library_init ()
class DummyOpenSSLInitializer
{
public:
DummyOpenSSLInitializer ()
{
#if LEGACY_OPENSSL
OPENSSL_no_config ();
#else
OPENSSL_init_ssl (OPENSSL_INIT_NO_LOAD_CONFIG, NULL);
#endif
}
};
static DummyOpenSSLInitializer g_OpenSSLInitializer; // must be called before
// boost::asio::ssl containing static openssl_init instance_;
#include <boost/asio/ssl.hpp>

Loading…
Cancel
Save