Correct deprecation of OPENSSL_config

[openssl.git] / include / openssl / conf.h

diff --git a/include/openssl/conf.h b/include/openssl/conf.h
index 9144c6d17d1cad888acceaa9c25048e50b2cd28e..24e9dee49fe8d39012f1d0397bc366d829513377 100644 (file)
--- a/include/openssl/conf.h
+++ b/include/openssl/conf.h
@@ -137,9 +137,12 @@ int CONF_dump_fp(LHASH_OF(CONF_VALUE) *conf, FILE *out);
 #endif
 int CONF_dump_bio(LHASH_OF(CONF_VALUE) *conf, BIO *out);
 
-void OPENSSL_config(const char *config_name);
-#define OPENSSL_no_config() \
-    OPENSSL_INIT_crypto_library_start(OPENSSL_INIT_NO_LOAD_CONFIG, NULL)
+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
 
 /*
  * New conf code.  The semantics are different from the functions above. If