diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-11-05 17:28:50 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-11-07 11:37:25 +0100 |
| commit | 936c2b9e933eacae80d3489e5f7316589f3e9a07 (patch) | |
| tree | bcc8e013817b791df5b290c5ec1892e93969b5fc /crypto/conf | |
| parent | Change the logic and behaviour surrounding '--api' and 'no-deprecated' (diff) | |
| download | openssl-936c2b9e933eacae80d3489e5f7316589f3e9a07.tar.xz openssl-936c2b9e933eacae80d3489e5f7316589f3e9a07.zip | |
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 <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10364)
Diffstat (limited to 'crypto/conf')
| -rw-r--r-- | crypto/conf/conf_def.c | 6 | ||||
| -rw-r--r-- | crypto/conf/conf_def.h | 2 | ||||
| -rw-r--r-- | crypto/conf/keysets.pl | 2 |
3 files changed, 5 insertions, 5 deletions
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) diff --git a/crypto/conf/conf_def.h b/crypto/conf/conf_def.h index 725c430c63..160611788f 100644 --- a/crypto/conf/conf_def.h +++ b/crypto/conf/conf_def.h @@ -56,7 +56,7 @@ static const unsigned short CONF_type_default[128] = { 0x0004, 0x0004, 0x0004, 0x0000, 0x0200, 0x0000, 0x0200, 0x0000, }; -#if ! OPENSSL_API_3 +#ifndef OPENSSL_NO_DEPRECATED_3_0 static const unsigned short CONF_type_win32[128] = { 0x0008, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0010, 0x0010, 0x0000, 0x0000, 0x0010, 0x0000, 0x0000, diff --git a/crypto/conf/keysets.pl b/crypto/conf/keysets.pl index 05b086f7fa..3c6eecd9ca 100644 --- a/crypto/conf/keysets.pl +++ b/crypto/conf/keysets.pl @@ -108,7 +108,7 @@ for ($i = 0; $i < 128; $i++) { } print "\n};\n\n"; -print "#if ! OPENSSL_API_3\n"; +print "#ifndef OPENSSL_NO_DEPRECATED_3_0\n"; print "static const unsigned short CONF_type_win32[128] = {"; for ($i = 0; $i < 128; $i++) { print "\n " if ($i % 8) == 0; |