diff options
| author | Rich Salz <rsalz@openssl.org> | 2015-01-25 21:15:57 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-01-25 21:15:57 -0500 |
| commit | 491f3e4e8e4ba8853caa02fbeff51b69768e9646 (patch) | |
| tree | c5796adba4bfa210ab134d2903f1d1197483449f /crypto/conf | |
| parent | 184693f4af2846dd89f473482e55df26c428da36 (diff) | |
| download | openssl-new-491f3e4e8e4ba8853caa02fbeff51b69768e9646.tar.gz | |
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 <matt@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
(cherry picked from commit abdd677125f3a9e3082f8c5692203590fdb9b860)
Diffstat (limited to 'crypto/conf')
| -rw-r--r-- | crypto/conf/conf_sap.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/crypto/conf/conf_sap.c b/crypto/conf/conf_sap.c index d03de24695..544fe97387 100644 --- a/crypto/conf/conf_sap.c +++ b/crypto/conf/conf_sap.c @@ -86,23 +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); - } - exit(1); - } - - return; + CONF_MFLAGS_IGNORE_MISSING_FILE); } void OPENSSL_no_config() |