diff options
author | Ben Laurie <ben@openssl.org> | 2002-01-22 22:29:58 +0000 |
---|---|---|
committer | Ben Laurie <ben@openssl.org> | 2002-01-22 22:29:58 +0000 |
commit | 0fc5cf0870c0c9e4240e118ee7a86e5d8b4a6891 (patch) | |
tree | a607373c3d631901191b83a22b04fa96b3e34a62 /crypto/conf/conf_mall.c | |
parent | f78d4a35f865d7678a8b8e7a496e72a19f3df014 (diff) | |
download | openssl-0fc5cf0870c0c9e4240e118ee7a86e5d8b4a6891.tar.gz |
Make no config file not an error. Move /dev/crypto config to ctrl.
Diffstat (limited to 'crypto/conf/conf_mall.c')
-rw-r--r-- | crypto/conf/conf_mall.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crypto/conf/conf_mall.c b/crypto/conf/conf_mall.c index 814d5df877..59c7cfb966 100644 --- a/crypto/conf/conf_mall.c +++ b/crypto/conf/conf_mall.c @@ -92,9 +92,10 @@ void OPENSSL_config(void) if (!file) return; - ret = CONF_modules_load_file(file, "openssl_config", 0); + ret=CONF_modules_load_file(file, "openssl_config", 0) <= 0 + && ERR_GET_REASON(ERR_peek_top_error()) != CONF_R_NO_SUCH_FILE; OPENSSL_free(file); - if (ret <= 0) + if (ret) { BIO *bio_err; ERR_load_crypto_strings(); |