summaryrefslogtreecommitdiffstats
path: root/fuzz
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 /fuzz
parentChange the logic and behaviour surrounding '--api' and 'no-deprecated' (diff)
downloadopenssl-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 'fuzz')
-rw-r--r--fuzz/asn1.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fuzz/asn1.c b/fuzz/asn1.c
index 4a5458af3e..17eaf6ca35 100644
--- a/fuzz/asn1.c
+++ b/fuzz/asn1.c
@@ -108,7 +108,7 @@ static ASN1_ITEM_EXP *item_type[] = {
ASN1_ITEM_ref(IPAddressRange),
#endif
ASN1_ITEM_ref(ISSUING_DIST_POINT),
-#if !OPENSSL_API_3
+#ifndef OPENSSL_NO_DEPRECATED_3_0
ASN1_ITEM_ref(LONG),
#endif
ASN1_ITEM_ref(NAME_CONSTRAINTS),
@@ -189,7 +189,7 @@ static ASN1_ITEM_EXP *item_type[] = {
ASN1_ITEM_ref(X509_REVOKED),
ASN1_ITEM_ref(X509_SIG),
ASN1_ITEM_ref(X509_VAL),
-#if !OPENSSL_API_3
+#ifndef OPENSSL_NO_DEPRECATED_3_0
ASN1_ITEM_ref(ZLONG),
#endif
ASN1_ITEM_ref(INT32),