X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fconf%2Fconf_mall.c;h=c6f4cb2d55be18b6211d91929e224b4c183dea46;hb=3c075bf07f2d57c0272260409bf38fb6f438b016;hp=814d5df8774c070fd73133935cfe2a4229d47400;hpb=c9501c223f0a3d48a17418afd107e7bfb25af6b1;p=oweals%2Fopenssl.git

diff --git a/crypto/conf/conf_mall.c b/crypto/conf/conf_mall.c
index 814d5df877..c6f4cb2d55 100644
--- a/crypto/conf/conf_mall.c
+++ b/crypto/conf/conf_mall.c
@@ -1,5 +1,5 @@
 /* conf_mall.c */
-/* Written by Stephen Henson (shenson@bigfoot.com) for the OpenSSL
+/* Written by Stephen Henson (steve@openssl.org) for the OpenSSL
  * project 2001.
  */
 /* ====================================================================
@@ -63,55 +63,18 @@
 #include <openssl/dso.h>
 #include <openssl/x509.h>
 #include <openssl/asn1.h>
+#ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
+#endif
+
+/* Load all OpenSSL builtin modules */
 
 void OPENSSL_load_builtin_modules(void)
 	{
 	/* Add builtin modules here */
 	ASN1_add_oid_module();
+#ifndef OPENSSL_NO_ENGINE
 	ENGINE_add_conf_module();
+#endif
 	}
 
-/* 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);
-	OPENSSL_free(file);
-	if (ret <= 0)
-		{
-		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;
-	}