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 /include/openssl/conf.h | |
parent | 77b8ad18408bae1166acbf73fb2acb1f92214ece (diff) | |
download | openssl-c35f5c3d3a557288b6c7dcaa17dbbc5916e3e263.tar.gz |
Correct deprecation of OPENSSL_config
Reported in GH#684
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'include/openssl/conf.h')
-rw-r--r-- | include/openssl/conf.h | 4 |
1 files changed, 2 insertions, 2 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 |