Enable configuring OpenSSL using the standard openssl.cnf (#8143)
This commit is contained in:
parent
bccbc5509a
commit
b5e99bd064
12
src/tls.c
12
src/tls.c
@ -34,6 +34,7 @@
|
|||||||
|
|
||||||
#ifdef USE_OPENSSL
|
#ifdef USE_OPENSSL
|
||||||
|
|
||||||
|
#include <openssl/conf.h>
|
||||||
#include <openssl/ssl.h>
|
#include <openssl/ssl.h>
|
||||||
#include <openssl/err.h>
|
#include <openssl/err.h>
|
||||||
#include <openssl/rand.h>
|
#include <openssl/rand.h>
|
||||||
@ -136,6 +137,17 @@ static void initCryptoLocks(void) {
|
|||||||
#endif /* USE_CRYPTO_LOCKS */
|
#endif /* USE_CRYPTO_LOCKS */
|
||||||
|
|
||||||
void tlsInit(void) {
|
void tlsInit(void) {
|
||||||
|
/* Enable configuring OpenSSL using the standard openssl.cnf
|
||||||
|
* OPENSSL_config()/OPENSSL_init_crypto() should be the first
|
||||||
|
* call to the OpenSSL* library.
|
||||||
|
* - OPENSSL_config() should be used for OpenSSL versions < 1.1.0
|
||||||
|
* - OPENSSL_init_crypto() should be used for OpenSSL versions >= 1.1.0
|
||||||
|
*/
|
||||||
|
#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||||
|
OPENSSL_config(NULL);
|
||||||
|
#else
|
||||||
|
OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, NULL);
|
||||||
|
#endif
|
||||||
ERR_load_crypto_strings();
|
ERR_load_crypto_strings();
|
||||||
SSL_load_error_strings();
|
SSL_load_error_strings();
|
||||||
SSL_library_init();
|
SSL_library_init();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user