diff options
| author | Rich Salz <rsalz@openssl.org> | 2015-01-25 21:07:20 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-01-25 21:07:20 -0500 |
| commit | abdd677125f3a9e3082f8c5692203590fdb9b860 (patch) | |
| tree | 2a51a88df3e4b86232ed5d1d18c81a52f369983b /crypto/conf/conf_sap.c | |
| parent | 8de24b792743d11e1d5a0dcd336a49368750c577 (diff) | |
| download | openssl-new-abdd677125f3a9e3082f8c5692203590fdb9b860.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>
Diffstat (limited to 'crypto/conf/conf_sap.c')
| -rw-r--r-- | crypto/conf/conf_sap.c | 18 |
1 files changed, 2 insertions, 16 deletions
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() |