diff options
author | Richard Levitte <levitte@openssl.org> | 2018-09-27 15:40:03 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2018-12-06 12:24:47 +0100 |
commit | 672f943ad6c6d16b1f65a77b8e2c83c8f44a112b (patch) | |
tree | 3fb5956fe778bde98cf81b1f9c43cd3b6d79eff5 /crypto/asn1 | |
parent | 2284f64c871c2f7611678dba6eadd1989cee9981 (diff) |
Switch future deprecation version from 1.2.0 to 3.0
This is in preparation for a switch to MAJOR.MINOR.PATCH versioning
and calling the next major version 3.0.0.
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7724)
Diffstat (limited to 'crypto/asn1')
-rw-r--r-- | crypto/asn1/asn1_item_list.h | 4 | ||||
-rw-r--r-- | crypto/asn1/x_long.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/crypto/asn1/asn1_item_list.h b/crypto/asn1/asn1_item_list.h index db8107ed1b..3e53c63237 100644 --- a/crypto/asn1/asn1_item_list.h +++ b/crypto/asn1/asn1_item_list.h @@ -78,7 +78,7 @@ static ASN1_ITEM_EXP *asn1_item_list[] = { ASN1_ITEM_ref(IPAddressRange), #endif ASN1_ITEM_ref(ISSUING_DIST_POINT), -#if OPENSSL_API_COMPAT < 0x10200000L +#if OPENSSL_API_COMPAT < 0x30000000L ASN1_ITEM_ref(LONG), #endif ASN1_ITEM_ref(NAME_CONSTRAINTS), @@ -164,7 +164,7 @@ static ASN1_ITEM_EXP *asn1_item_list[] = { ASN1_ITEM_ref(X509_SIG), ASN1_ITEM_ref(X509_VAL), ASN1_ITEM_ref(X509), -#if OPENSSL_API_COMPAT < 0x10200000L +#if OPENSSL_API_COMPAT < 0x30000000L ASN1_ITEM_ref(ZLONG), #endif ASN1_ITEM_ref(INT32), diff --git a/crypto/asn1/x_long.c b/crypto/asn1/x_long.c index bf9371ef55..537db1b381 100644 --- a/crypto/asn1/x_long.c +++ b/crypto/asn1/x_long.c @@ -11,7 +11,7 @@ #include "internal/cryptlib.h" #include <openssl/asn1t.h> -#if !(OPENSSL_API_COMPAT < 0x10200000L) +#if !(OPENSSL_API_COMPAT < 0x30000000L) NON_EMPTY_TRANSLATION_UNIT #else |