summaryrefslogtreecommitdiffstats
path: root/engines/e_capi_err.h
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2019-11-05 17:28:50 +0100
committerRichard Levitte <levitte@openssl.org>2019-11-07 11:37:25 +0100
commit936c2b9e933eacae80d3489e5f7316589f3e9a07 (patch)
treebcc8e013817b791df5b290c5ec1892e93969b5fc /engines/e_capi_err.h
parenta6a4d0acd23b3fc85041d9096b67bcf18ccb635c (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 'engines/e_capi_err.h')
-rw-r--r--engines/e_capi_err.h2
1 files changed, 1 insertions, 1 deletions
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