New OPENSSL_LOAD_CONF define to load openssl.cnf

[openssl.git] / crypto / conf / conf_mall.c

diff --git a/crypto/conf/conf_mall.c b/crypto/conf/conf_mall.c
index 59c7cfb966bace733a923059c0d2dacd2f0e5e15..d702af689ba32422f3cd6c430087a96d54b16de2 100644 (file)
--- a/crypto/conf/conf_mall.c
+++ b/crypto/conf/conf_mall.c
@@ -65,6 +65,8 @@
 #include <openssl/asn1.h>
 #include <openssl/engine.h>
 
+/* Load all OpenSSL builtin modules */
+
 void OPENSSL_load_builtin_modules(void)
        {
        /* Add builtin modules here */
@@ -72,47 +74,3 @@ void OPENSSL_load_builtin_modules(void)
        ENGINE_add_conf_module();
        }
 
-/* This is the automatic configuration loader: it is called automatically by
- * OpenSSL when any of a number of standard initialisation functions are called,
- * unless this is overridden by calling OPENSSL_no_config()
- */
-
-static int openssl_configured = 0;
-
-void OPENSSL_config(void)
-       {
-       int ret;
-       char *file;
-       if (openssl_configured)
-               return;
-
-       OPENSSL_load_builtin_modules();
-
-       file = CONF_get1_default_config_file();
-       if (!file)
-               return;
-
-       ret=CONF_modules_load_file(file, "openssl_config", 0) <= 0
-         && ERR_GET_REASON(ERR_peek_top_error()) != CONF_R_NO_SUCH_FILE;
-       OPENSSL_free(file);
-       if (ret)
-               {
-               BIO *bio_err;
-               ERR_load_crypto_strings();
-               if ((bio_err=BIO_new(BIO_s_file())) != NULL)
-                       {
-                       BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
-                       BIO_printf(bio_err,"Auto configuration failed\n");
-                       ERR_print_errors(bio_err);
-                       }
-               exit(1);
-               }
-
-       return;
-
-       }
-
-void OPENSSL_no_config()
-       {
-       openssl_configured = 1;
-       }