summaryrefslogtreecommitdiffstats
path: root/crypto/conf
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2019-03-20 10:18:13 +0100
committerRichard Levitte <levitte@openssl.org>2019-03-20 14:25:43 +0100
commit9933d4a06bd0a0b5b757f072944e8cd54d4bddd3 (patch)
tree2ad619a3e02adea39bd93bdd3f80f701779fc46c /crypto/conf
parent20a8bce4bb70a3c4bfc69035c703fcdf8dcbc6cf (diff)
OPENSSL_config(): restore error agnosticism
Great effort has been made to make initialization more configurable. However, the behavior of OPENSSL_config() was lost in the process, having it suddenly generate errors it didn't previously, which is not how it's documented to behave. A simple setting of default flags fixes this problem. Fixes #8528 Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/8533) (cherry picked from commit 905c9a72a708701597891527b422c7f374125c52)
Diffstat (limited to 'crypto/conf')
-rw-r--r--crypto/conf/conf_sap.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/conf/conf_sap.c b/crypto/conf/conf_sap.c
index 2ce42f0c67..3805c426d8 100644
--- a/crypto/conf/conf_sap.c
+++ b/crypto/conf/conf_sap.c
@@ -35,6 +35,7 @@ void OPENSSL_config(const char *appname)
memset(&settings, 0, sizeof(settings));
if (appname != NULL)
settings.appname = strdup(appname);
+ settings.flags = DEFAULT_CONF_MFLAGS;
OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, &settings);
}
#endif