diff options
author | Shane Lontis <shane.lontis@oracle.com> | 2021-03-09 11:36:36 +1000 |
---|---|---|
committer | Shane Lontis <shane.lontis@oracle.com> | 2021-03-18 17:52:37 +1000 |
commit | f148f7034c9e2f9155ca4a8e51cbe7af02f8600a (patch) | |
tree | ae4d11118b29bb1a635194753cfc37f9d5cf43f5 /crypto/conf | |
parent | 054d43ff972068a0f2ec07319808ca32ad0afb5f (diff) |
Add ossl_ conf symbols
Partial fix for #12964
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14473)
Diffstat (limited to 'crypto/conf')
-rw-r--r-- | crypto/conf/conf_local.h | 3 | ||||
-rw-r--r-- | crypto/conf/conf_mall.c | 2 | ||||
-rw-r--r-- | crypto/conf/conf_mod.c | 2 | ||||
-rw-r--r-- | crypto/conf/conf_sap.c | 6 | ||||
-rw-r--r-- | crypto/conf/conf_ssl.c | 2 |
5 files changed, 7 insertions, 8 deletions
diff --git a/crypto/conf/conf_local.h b/crypto/conf/conf_local.h index 1bc9c701ac..9961010f45 100644 --- a/crypto/conf/conf_local.h +++ b/crypto/conf/conf_local.h @@ -7,5 +7,4 @@ * https://www.openssl.org/source/license.html */ -void conf_add_ssl_module(void); - +void ossl_config_add_ssl_module(void); diff --git a/crypto/conf/conf_mall.c b/crypto/conf/conf_mall.c index 5d24a36cd9..50e7038074 100644 --- a/crypto/conf/conf_mall.c +++ b/crypto/conf/conf_mall.c @@ -32,7 +32,7 @@ void OPENSSL_load_builtin_modules(void) ENGINE_add_conf_module(); #endif EVP_add_alg_module(); - conf_add_ssl_module(); + ossl_config_add_ssl_module(); ossl_provider_add_conf_module(); ossl_random_add_conf_module(); } diff --git a/crypto/conf/conf_mod.c b/crypto/conf/conf_mod.c index b42eb36aba..93e0fa5e17 100644 --- a/crypto/conf/conf_mod.c +++ b/crypto/conf/conf_mod.c @@ -485,7 +485,7 @@ int CONF_module_add(const char *name, conf_init_func *ifunc, return 0; } -void conf_modules_free_int(void) +void ossl_config_modules_free(void) { CONF_modules_finish(); CONF_modules_unload(1); diff --git a/crypto/conf/conf_sap.c b/crypto/conf/conf_sap.c index ffd9e9c5b2..1969f0d05a 100644 --- a/crypto/conf/conf_sap.c +++ b/crypto/conf/conf_sap.c @@ -40,7 +40,7 @@ void OPENSSL_config(const char *appname) } #endif -int openssl_config_int(const OPENSSL_INIT_SETTINGS *settings) +int ossl_config_int(const OPENSSL_INIT_SETTINGS *settings) { int ret = 0; const char *filename; @@ -55,7 +55,7 @@ int openssl_config_int(const OPENSSL_INIT_SETTINGS *settings) flags = settings ? settings->flags : DEFAULT_CONF_MFLAGS; #ifdef OPENSSL_INIT_DEBUG - fprintf(stderr, "OPENSSL_INIT: openssl_config_int(%s, %s, %lu)\n", + fprintf(stderr, "OPENSSL_INIT: ossl_config_int(%s, %s, %lu)\n", filename, appname, flags); #endif @@ -66,7 +66,7 @@ int openssl_config_int(const OPENSSL_INIT_SETTINGS *settings) return ret; } -void openssl_no_config_int(void) +void ossl_no_config_int(void) { openssl_configured = 1; } diff --git a/crypto/conf/conf_ssl.c b/crypto/conf/conf_ssl.c index a4b35bab99..d32289ec44 100644 --- a/crypto/conf/conf_ssl.c +++ b/crypto/conf/conf_ssl.c @@ -176,7 +176,7 @@ void conf_ssl_get_cmd(const SSL_CONF_CMD *cmd, size_t idx, char **cmdstr, *arg = cmd[idx].arg; } -void conf_add_ssl_module(void) +void ossl_config_add_ssl_module(void) { CONF_module_add("ssl_conf", ssl_module_init, ssl_module_free); } |