diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-11-05 19:28:50 +0300 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-11-07 13:37:25 +0300 |
| commit | 936c2b9e933eacae80d3489e5f7316589f3e9a07 (patch) | |
| tree | bcc8e013817b791df5b290c5ec1892e93969b5fc /include/internal | |
| parent | a6a4d0acd23b3fc85041d9096b67bcf18ccb635c (diff) | |
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 'include/internal')
| -rw-r--r-- | include/internal/dsoerr.h | 2 | ||||
| -rw-r--r-- | include/internal/propertyerr.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/internal/dsoerr.h b/include/internal/dsoerr.h index 9ddb9cff4d..ce9c8f0cf3 100644 --- a/include/internal/dsoerr.h +++ b/include/internal/dsoerr.h @@ -23,7 +23,7 @@ int ERR_load_DSO_strings(void); /* * DSO function codes. */ -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define DSO_F_DLFCN_BIND_FUNC 0 # define DSO_F_DLFCN_LOAD 0 # define DSO_F_DLFCN_MERGER 0 diff --git a/include/internal/propertyerr.h b/include/internal/propertyerr.h index ebbd8619b2..b3d63ab4a0 100644 --- a/include/internal/propertyerr.h +++ b/include/internal/propertyerr.h @@ -23,7 +23,7 @@ int ERR_load_PROP_strings(void); /* * PROP function codes. */ -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define PROP_F_OSSL_PARSE_PROPERTY 0 # define PROP_F_OSSL_PARSE_QUERY 0 # define PROP_F_PARSE_HEX 0 |