From abdd677125f3a9e3082f8c5692203590fdb9b860 Mon Sep 17 00:00:00 2001 From: Rich Salz Date: Sun, 25 Jan 2015 21:07:20 -0500 Subject: Make OPENSSL_config truly ignore errors. Per discussion: should not exit. Should not print to stderr. Errors are ignored. Updated doc to reflect that, and the fact that this function is to be avoided. Reviewed-by: Matt Caswell Reviewed-by: Tim Hudson Reviewed-by: Viktor Dukhovni --- crypto/conf/conf_sap.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'crypto/conf/conf_sap.c') diff --git a/crypto/conf/conf_sap.c b/crypto/conf/conf_sap.c index a3e78961e3..544fe97387 100644 --- a/crypto/conf/conf_sap.c +++ b/crypto/conf/conf_sap.c @@ -86,24 +86,10 @@ void OPENSSL_config(const char *config_name) /* Need to load ENGINEs */ ENGINE_load_builtin_engines(); #endif - /* Add others here? */ - ERR_clear_error(); - if (CONF_modules_load_file(NULL, config_name, + CONF_modules_load_file(NULL, config_name, CONF_MFLAGS_DEFAULT_SECTION | - CONF_MFLAGS_IGNORE_MISSING_FILE) <= 0) { - BIO *bio_err; - ERR_load_crypto_strings(); - if ((bio_err = BIO_new_fp(stderr, BIO_NOCLOSE)) != NULL) { - BIO_printf(bio_err, "Auto configuration failed\n"); - ERR_print_errors(bio_err); - BIO_free(bio_err); - } - fprintf(stderr, "OpenSSL could not auto-configure.\n"); - exit(1); - } - - return; + CONF_MFLAGS_IGNORE_MISSING_FILE); } void OPENSSL_no_config() -- cgit v1.2.3