Commit 69b89050 authored by Michael Kalinin's avatar Michael Kalinin Committed by Jay Satiro
Browse files

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
parent 963b7bd4

lib/vtls/openssl.c

+9 −10
Original line number Diff line number Diff line
@@ -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;

}