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

diff --git a/crypto/conf/conf_mall.c b/crypto/conf/conf_mall.c
index 01a653252c..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,46 +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();
-	}
-
-/* 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)
-	{
-	char *file, config_name[256];
-	if (openssl_configured)
-		return;
-
-	OPENSSL_load_builtin_modules();
-
-	file = getenv("OPENSSL_CONF");
-	if (!file)
-                {
-		strcpy(config_name,X509_get_default_cert_area());
-#ifndef OPENSSL_SYS_VMS
-		strcat(config_name,"/");
+#ifndef OPENSSL_NO_ENGINE
+	ENGINE_add_conf_module();
 #endif
-		strcat(config_name,OPENSSL_CONF);
-		file=config_name;
-                }
-
-	CONF_modules_load_file(file, "openssl_config", CONF_MFLAGS_IGNORE_ERRORS);
-
-	return;
-
 	}
 
-void OPENSSL_no_config()
-	{
-	openssl_configured = 1;
-	}