mirror of https://github.com/moparisthebest/curl
openssl: Fix algorithm init
- Change algorithm init to happen after OpenSSL config load. Additional algorithms may be available due to the user's config so we initialize the algorithms after the user's config is loaded. Bug: https://github.com/bagder/curl/issues/447 Reported-by: Denis Feklushkin
This commit is contained in:
parent
963b7bd4f7
commit
69b89050d4
|
@ -702,16 +702,6 @@ int Curl_ossl_init(void)
|
|||
ENGINE_load_builtin_engines();
|
||||
#endif
|
||||
|
||||
/* Lets get nice error messages */
|
||||
SSL_load_error_strings();
|
||||
|
||||
/* Init the global ciphers and digests */
|
||||
if(!SSLeay_add_ssl_algorithms())
|
||||
return 0;
|
||||
|
||||
OpenSSL_add_all_algorithms();
|
||||
|
||||
|
||||
/* OPENSSL_config(NULL); is "strongly recommended" to use but unfortunately
|
||||
that function makes an exit() call on wrongly formatted config files
|
||||
which makes it hard to use in some situations. OPENSSL_config() itself
|
||||
|
@ -728,6 +718,15 @@ int Curl_ossl_init(void)
|
|||
CONF_MFLAGS_DEFAULT_SECTION|
|
||||
CONF_MFLAGS_IGNORE_MISSING_FILE);
|
||||
|
||||
/* Lets get nice error messages */
|
||||
SSL_load_error_strings();
|
||||
|
||||
/* Init the global ciphers and digests */
|
||||
if(!SSLeay_add_ssl_algorithms())
|
||||
return 0;
|
||||
|
||||
OpenSSL_add_all_algorithms();
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue