From 936c2b9e933eacae80d3489e5f7316589f3e9a07 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Tue, 5 Nov 2019 17:28:50 +0100 Subject: Update source files for deprecation at 3.0 Previous macros suggested that from 3.0, we're only allowed to deprecate things at a major version. However, there's no policy stating this, but there is for removal, saying that to remove something, it must have been deprecated for 5 years, and that removal can only happen at a major version. Meanwhile, the semantic versioning rule is that deprecation should trigger a MINOR version update, which is reflected in the macro names as of this change. Reviewed-by: Tim Hudson (Merged from https://github.com/openssl/openssl/pull/10364) --- crypto/conf/conf_def.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'crypto/conf/conf_def.c') diff --git a/crypto/conf/conf_def.c b/crypto/conf/conf_def.c index a43225ecf7..a8581d7320 100644 --- a/crypto/conf/conf_def.c +++ b/crypto/conf/conf_def.c @@ -54,7 +54,7 @@ static BIO *get_next_file(const char *path, OPENSSL_DIR_CTX **dirctx); static CONF *def_create(CONF_METHOD *meth); static int def_init_default(CONF *conf); -#if !OPENSSL_API_3 +#ifndef OPENSSL_NO_DEPRECATED_3_0 static int def_init_WIN32(CONF *conf); #endif static int def_destroy(CONF *conf); @@ -83,7 +83,7 @@ CONF_METHOD *NCONF_default(void) return &default_method; } -#if ! OPENSSL_API_3 +#ifndef OPENSSL_NO_DEPRECATED_3_0 static CONF_METHOD WIN32_method = { "WIN32", def_create, @@ -128,7 +128,7 @@ static int def_init_default(CONF *conf) return 1; } -#if ! OPENSSL_API_3 +#ifndef OPENSSL_NO_DEPRECATED_3_0 static int def_init_WIN32(CONF *conf) { if (conf == NULL) -- cgit v1.2.3