OPENSSL_LOAD_CONF define as in main trunk

diff --git a/CHANGES b/CHANGES
index 3829e4339b5463d26fa15a5b21948d0bea30e1f8..03a91009d72498557f3020a4e9f6a9b1a132f8f3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -13,6 +13,15 @@
          *) applies to 0.9.6a/0.9.6b/0.9.6c and 0.9.7
          +) applies to 0.9.7 only
 
+  +) Add and OPENSSL_LOAD_CONF define which will cause
+     OpenSSL_add_all_algorithms() to load the openssl.cnf config file.
+     This allows older applications to transparently support certain
+     OpenSSL features: such as crypto acceleration and dynamic ENGINE loading.
+     Two new functions OPENSSL_add_all_algorithms_noconf() which will never
+     load the config file and OPENSSL_add_all_algorithms_conf() which will
+     always load it have also been added.
+     [Steve Henson]
+
   +) Config modules support in openssl utility.
 
      Most commands now load modules from the config file,

diff --git a/crypto/conf/Makefile.ssl b/crypto/conf/Makefile.ssl
index 554d032007c3d33c09eaa14d8f92e7be779acb22..2891c33536c17f5ebf562ef9e1a3ec69f3379b47 100644 (file)
--- a/crypto/conf/Makefile.ssl
+++ b/crypto/conf/Makefile.ssl
@@ -23,9 +23,11 @@ TEST=
 APPS=
 
 LIB=$(TOP)/libcrypto.a
-LIBSRC= conf_err.c conf_lib.c conf_api.c conf_def.c conf_mod.c conf_mall.c
+LIBSRC= conf_err.c conf_lib.c conf_api.c conf_def.c conf_mod.c \
+        conf_mall.c conf_sap.c
 
-LIBOBJ=        conf_err.o conf_lib.o conf_api.o conf_def.o conf_mod.o conf_mall.o
+LIBOBJ=        conf_err.o conf_lib.o conf_api.o conf_def.o conf_mod.o \
+       conf_mall.o conf_sap.o
 
 SRC= $(LIBSRC)
 

diff --git a/crypto/conf/conf_mall.c b/crypto/conf/conf_mall.c
index c1bab7df3ab2fe1e55e062ea1b25cdd1140f5e89..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,42 +74,3 @@ void OPENSSL_load_builtin_modules(void)
        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;
-       }

diff --git a/crypto/evp/Makefile.ssl b/crypto/evp/Makefile.ssl
index 9b5de1f590c95c35393a5206d5c2444f0fadf721..5371484b241feb3cca8b4a24871009b3bb734513 100644 (file)
--- a/crypto/evp/Makefile.ssl
+++ b/crypto/evp/Makefile.ssl
@@ -24,7 +24,7 @@ TESTDATA=evptests.txt
 APPS=
 
 LIB=$(TOP)/libcrypto.a
-LIBSRC= encode.c digest.c evp_enc.c evp_key.c \
+LIBSRC= encode.c digest.c evp_enc.c evp_key.c evp_acnf.c \
        e_des.c e_bf.c e_idea.c e_des3.c \
        e_rc4.c e_aes.c names.c \
        e_xcbc_d.c e_rc2.c e_cast.c e_rc5.c \
@@ -35,7 +35,7 @@ LIBSRC= encode.c digest.c evp_enc.c evp_key.c \
        c_all.c c_allc.c c_alld.c evp_lib.c bio_ok.c \
        evp_pkey.c evp_pbe.c p5_crpt.c p5_crpt2.c
 
-LIBOBJ=        encode.o digest.o evp_enc.o evp_key.o \
+LIBOBJ=        encode.o digest.o evp_enc.o evp_key.o evp_acnf.o \
        e_des.o e_bf.o e_idea.o e_des3.o \
        e_rc4.o e_aes.o names.o \
        e_xcbc_d.o e_rc2.o e_cast.o e_rc5.o \

diff --git a/crypto/evp/c_all.c b/crypto/evp/c_all.c
index 1e185830a35764ce601862bb4dd9406624c6a6bf..5ffd352ea0c784c9817287b9675a5713e65f095b 100644 (file)
--- a/crypto/evp/c_all.c
+++ b/crypto/evp/c_all.c
@@ -60,8 +60,15 @@
 #include "cryptlib.h"
 #include <openssl/evp.h>
 
+#undef OpenSSL_add_all_algorithms
+
 void OpenSSL_add_all_algorithms(void)
-{
+       {
+       OPENSSL_add_all_algorithms_noconf();
+       }
+
+void OPENSSL_add_all_algorithms_noconf(void)
+       {
        OpenSSL_add_all_ciphers();
        OpenSSL_add_all_digests();
-}
+       }

diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h
index beb2c9eb44bd17430bef3a5711cc764ffd4b68e5..0dcd15ca72a5063861bf421e1b2a8a4f9805c3e8 100644 (file)
--- a/crypto/evp/evp.h
+++ b/crypto/evp/evp.h
@@ -645,7 +645,17 @@ const EVP_CIPHER *EVP_aes_256_ecb(void);
 const EVP_CIPHER *EVP_aes_256_cbc(void);
 #endif
 
-void OpenSSL_add_all_algorithms(void);
+void OPENSSL_add_all_algorithms_noconf(void);
+void OPENSSL_add_all_algorithms_conf(void);
+
+#ifdef OPENSSL_LOAD_CONF
+#define OpenSSL_add_all_algorithms() \
+               OPENSSL_add_all_algorithms_conf()
+#else
+#define OpenSSL_add_all_algorithms() \
+               OPENSSL_add_all_algorithms_noconf()
+#endif
+
 void OpenSSL_add_all_ciphers(void);
 void OpenSSL_add_all_digests(void);
 #define SSLeay_add_all_algorithms() OpenSSL_add_all_algorithms()