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 /apps/enc.c | |
| parent | a6a4d0acd23b3fc85041d9096b67bcf18ccb635c (diff) | |
| download | openssl-new-936c2b9e933eacae80d3489e5f7316589f3e9a07.tar.gz | |
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 'apps/enc.c')
| -rw-r--r-- | apps/enc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/enc.c b/apps/enc.c index 611d0536bc..243cc1280c 100644 --- a/apps/enc.c +++ b/apps/enc.c @@ -51,7 +51,7 @@ typedef enum OPTION_choice { const OPTIONS enc_options[] = { {"help", OPT_HELP, '-', "Display this summary"}, {"list", OPT_LIST, '-', "List ciphers"}, -#if !OPENSSL_API_3 +#ifndef OPENSSL_NO_DEPRECATED_3_0 {"ciphers", OPT_LIST, '-', "Alias for -list"}, #endif {"in", OPT_IN, '<', "Input file"}, |