diff options
author | Matt Caswell <matt@openssl.org> | 2016-02-08 16:43:03 +0000 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2016-02-09 15:11:38 +0000 |
commit | 7b9f8f7f03eda2faa1cdd42ed29a0b70e60eaf59 (patch) | |
tree | 30f805756265bd1d016aead84dcf1c909cca8b4b /crypto/conf/conf_sap.c | |
parent | b184e3ef73200cb3b7914a603b43a5b8a074c85f (diff) |
Auto init/deinit libcrypto
This builds on the previous commit to auto initialise/deinitialise
libcrypto.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/conf/conf_sap.c')
-rw-r--r-- | crypto/conf/conf_sap.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/crypto/conf/conf_sap.c b/crypto/conf/conf_sap.c index fead45134a..bb1dcc502f 100644 --- a/crypto/conf/conf_sap.c +++ b/crypto/conf/conf_sap.c @@ -59,7 +59,7 @@ #include <stdio.h> #include <openssl/crypto.h> #include "internal/cryptlib.h" -#include <openssl/conf.h> +#include <internal/conf.h> #include <openssl/dso.h> #include <openssl/x509.h> #include <openssl/asn1.h> @@ -77,6 +77,16 @@ static int openssl_configured = 0; void OPENSSL_config(const char *config_name) { + const OPENSSL_INIT_SETTINGS settings[2] = { + { OPENSSL_INIT_SET_CONF_FILENAME, .value.type_string = config_name }, + { OPENSSL_INIT_SET_END, .value.type_int = 0 } + }; + OPENSSL_INIT_crypto_library_start(OPENSSL_INIT_LOAD_CONFIG, + (const OPENSSL_INIT_SETTINGS *)&settings); +} + +void openssl_config_internal(const char *config_name) +{ if (openssl_configured) return; @@ -94,7 +104,7 @@ void OPENSSL_config(const char *config_name) openssl_configured = 1; } -void OPENSSL_no_config() +void openssl_no_config_internal(void) { openssl_configured = 1; } |