arm_arch.h: allow to specify __ARM_ARCH__ elsewhere.

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

diff --git a/crypto/conf/conf_mall.c b/crypto/conf/conf_mall.c
index c1bab7df3ab2fe1e55e062ea1b25cdd1140f5e89..c6f4cb2d55be18b6211d91929e224b4c183dea46 100644 (file)
--- 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,51 +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();
-       }
-
-#if 0 /* not yet */
-/* 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()
- */
 #endif
-
-static int openssl_configured = 0;
-
-void OPENSSL_config(const char *config_name)
-       {
-       if (openssl_configured)
-               return;
-
-       OPENSSL_load_builtin_modules();
-
-       ERR_clear_error();
-       if (CONF_modules_load_file(NULL, NULL,
-                                       CONF_MFLAGS_IGNORE_MISSING_FILE) <= 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);
-                       BIO_free(bio_err);
-                       }
-               exit(1);
-               }
-
-       return;
        }
 
-void OPENSSL_no_config()
-       {
-       openssl_configured = 1;
-       }