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 /engines | |
| 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 'engines')
| -rw-r--r-- | engines/e_afalg_err.h | 2 | ||||
| -rw-r--r-- | engines/e_capi_err.h | 2 | ||||
| -rw-r--r-- | engines/e_dasync_err.h | 2 | ||||
| -rw-r--r-- | engines/e_ossltest_err.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/engines/e_afalg_err.h b/engines/e_afalg_err.h index 371723535b..557df5d401 100644 --- a/engines/e_afalg_err.h +++ b/engines/e_afalg_err.h @@ -21,7 +21,7 @@ /* * AFALG function codes. */ -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define AFALG_F_AFALG_CHK_PLATFORM 0 # define AFALG_F_AFALG_CREATE_SK 0 # define AFALG_F_AFALG_INIT_AIO 0 diff --git a/engines/e_capi_err.h b/engines/e_capi_err.h index 048b6d171a..c8bd24869a 100644 --- a/engines/e_capi_err.h +++ b/engines/e_capi_err.h @@ -21,7 +21,7 @@ /* * CAPI function codes. */ -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define CAPI_F_CAPI_CERT_GET_FNAME 0 # define CAPI_F_CAPI_CTRL 0 # define CAPI_F_CAPI_CTX_NEW 0 diff --git a/engines/e_dasync_err.h b/engines/e_dasync_err.h index a9db187f1d..7d2ea7936f 100644 --- a/engines/e_dasync_err.h +++ b/engines/e_dasync_err.h @@ -21,7 +21,7 @@ /* * DASYNC function codes. */ -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define DASYNC_F_BIND_DASYNC 0 # define DASYNC_F_CIPHER_AES_128_CBC_CODE 0 # define DASYNC_F_DASYNC_AES128_CBC_HMAC_SHA1_INIT_KEY 0 diff --git a/engines/e_ossltest_err.h b/engines/e_ossltest_err.h index 70a0bc667f..0c23b0c453 100644 --- a/engines/e_ossltest_err.h +++ b/engines/e_ossltest_err.h @@ -21,7 +21,7 @@ /* * OSSLTEST function codes. */ -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define OSSLTEST_F_BIND_OSSLTEST 0 # define OSSLTEST_F_OSSLTEST_AES128_INIT_KEY 0 # endif |