From: Marcus Meissner <meissner@suse.de>
Date: Tue, 24 Nov 2015 21:03:58 +0000 (+0100)
Subject: mark openssl configuration as loaded at end of OPENSSL_config
X-Git-Tag: OpenSSL_1_0_2e~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=296f7bd1ace9383648795b24bf2f3c10d0b9ca47;p=openssl

mark openssl configuration as loaded at end of OPENSSL_config

Signed-off-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Rich Salz <rsalz@akamai.com>

GH: #466
(cherry picked from commit 434b58457c8cca4d09f77a1774d6d2c446604bae)
---

diff --git a/crypto/conf/conf_sap.c b/crypto/conf/conf_sap.c
index 544fe97387..c042cf222d 100644
--- a/crypto/conf/conf_sap.c
+++ b/crypto/conf/conf_sap.c
@@ -90,6 +90,7 @@ void OPENSSL_config(const char *config_name)
     CONF_modules_load_file(NULL, config_name,
                                CONF_MFLAGS_DEFAULT_SECTION |
                                CONF_MFLAGS_IGNORE_MISSING_FILE);
+    openssl_configured = 1;
 }
 
 void OPENSSL_no_config()