Correct deprecation of OPENSSL_config

Reported in GH#684 Reviewed-by: N Matt Caswell <matt@openssl.org>

Correct deprecation of OPENSSL_config
Reported in GH#684 Reviewed-by: N Matt Caswell <matt@openssl.org>
c35f5c3d · Richard Levitte · 77b8ad18 · c35f5c3d · c35f5c3d
显示空白变更内容
内联并排

Showing with 3 addition and 3 deletion

include/openssl/conf.h include/openssl/conf.h +2 -2

util/libeay.num util/libeay.num +1 -1

未找到文件。
--- a/include/openssl/conf.h
+++ b/include/openssl/conf.h
@@ -137,9 +137,9 @@ int CONF_dump_fp(LHASH_OF(CONF_VALUE) *conf, FILE *out);
 #endif
 int CONF_dump_bio(LHASH_OF(CONF_VALUE) *conf, BIO *out);

-#if OPENSSL_API_COMPAT < 0x10100000L
-void OPENSSL_config(const char *config_name);
+DEPRECATEDIN_1_1_0(void OPENSSL_config(const char *config_name))

+#if OPENSSL_API_COMPAT < 0x10100000L
 # define OPENSSL_no_config() \
    OPENSSL_init_crypto(OPENSSL_INIT_NO_LOAD_CONFIG, NULL)
 #endif

--- a/util/libeay.num
+++ b/util/libeay.num
@@ -2691,7 +2691,7 @@ ENGINE_set_default_string               3184	1_1_0	EXIST::FUNCTION:ENGINE
 CONF_module_get_usr_data                3185	1_1_0	EXIST::FUNCTION:
 ASN1_add_oid_module                     3186	1_1_0	EXIST::FUNCTION:
 CONF_modules_finish                     3187	1_1_0	EXIST::FUNCTION:
-OPENSSL_config                          3188	1_1_0	EXIST::FUNCTION:
+OPENSSL_config                          3188	1_1_0	EXIST::FUNCTION:DEPRECATEDIN_1_1_0
 CONF_modules_unload                     3189	1_1_0	EXIST::FUNCTION:
 CONF_imodule_get_value                  3190	1_1_0	EXIST::FUNCTION:
 CONF_module_set_usr_data                3191	1_1_0	EXIST::FUNCTION: