Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
b5e99bd0
"vscode:/vscode.git/clone" did not exist on "a81a92ca2ceba364f4bb51efde9284d939e7ff47"
Unverified
Commit
b5e99bd0
authored
Dec 07, 2020
by
filipe oliveira
Committed by
GitHub
Dec 07, 2020
Browse files
Enable configuring OpenSSL using the standard openssl.cnf (#8143)
parent
bccbc550
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/tls.c
View file @
b5e99bd0
...
@@ -34,6 +34,7 @@
...
@@ -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) {
...
@@ -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
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment