diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2002-02-23 02:09:29 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2002-02-23 02:09:29 +0000 |
commit | 344b3b5ce1556816758ec1d20c00fd8dfa3634ff (patch) | |
tree | 560c62c89572dd5bad87d10d803aedfba13a90c9 /crypto/conf | |
parent | 3f7cf2912448b9c0f4475050091a72b2c570c321 (diff) |
OPENSSL_LOAD_CONF define as in main trunk
Diffstat (limited to 'crypto/conf')
-rw-r--r-- | crypto/conf/Makefile.ssl | 6 | ||||
-rw-r--r-- | crypto/conf/conf_mall.c | 41 |
2 files changed, 6 insertions, 41 deletions
diff --git a/crypto/conf/Makefile.ssl b/crypto/conf/Makefile.ssl index 554d032007..2891c33536 100644 --- 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 c1bab7df3a..d702af689b 100644 --- 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; - } |