diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-02-15 16:14:46 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-02-15 16:25:10 +0100 |
| commit | c35f5c3d3a557288b6c7dcaa17dbbc5916e3e263 (patch) | |
| tree | 9bc77f5d7238913e5279fa8ce240dfedfde643e4 | |
| parent | 77b8ad18408bae1166acbf73fb2acb1f92214ece (diff) | |
Correct deprecation of OPENSSL_config
Reported in GH#684
Reviewed-by: Matt Caswell <matt@openssl.org>
| -rw-r--r-- | include/openssl/conf.h | 4 | ||||
| -rwxr-xr-x | util/libeay.num | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/openssl/conf.h b/include/openssl/conf.h index e2c245c56f..24e9dee49f 100644 --- 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 diff --git a/util/libeay.num b/util/libeay.num index 0ca9f7b9ee..4d50324464 100755 --- 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: |