mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-01-30 14:01:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Correct deprecation of OPENSSL_config

Browse Source 
Reported in GH#684

Reviewed-by: Matt Caswell <matt@openssl.org>
This commit is contained in:
Richard Levitte 2016-02-15 16:14:46 +01:00
parent 77b8ad1840
commit c35f5c3d3a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/openssl/conf.h
View File

@ -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

2
util/libeay.num
View File

@ -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: