From 672f943ad6c6d16b1f65a77b8e2c83c8f44a112b Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Thu, 27 Sep 2018 15:40:03 +0200 Subject: 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 Reviewed-by: Matthias St. Pierre Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/7724) --- test/asn1_decode_test.c | 4 ++-- test/asn1_encode_test.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'test') diff --git a/test/asn1_decode_test.c b/test/asn1_decode_test.c index 369023d5f1..b48b9b57bc 100644 --- a/test/asn1_decode_test.c +++ b/test/asn1_decode_test.c @@ -28,7 +28,7 @@ static unsigned char t_invalid_zero[] = { 0x02, 0x00 /* INTEGER tag + length */ }; -#if OPENSSL_API_COMPAT < 0x10200000L +#if OPENSSL_API_COMPAT < 0x30000000L /* LONG case ************************************************************* */ typedef struct { @@ -162,7 +162,7 @@ static int test_uint64(void) int setup_tests(void) { -#if OPENSSL_API_COMPAT < 0x10200000L +#if OPENSSL_API_COMPAT < 0x30000000L ADD_TEST(test_long); #endif ADD_TEST(test_int32); diff --git a/test/asn1_encode_test.c b/test/asn1_encode_test.c index 6a64bf904b..4c4820e592 100644 --- a/test/asn1_encode_test.c +++ b/test/asn1_encode_test.c @@ -179,7 +179,7 @@ typedef struct { ENCDEC_DATA(-1, -1), \ ENCDEC_DATA(0, ASN1_LONG_UNDEF) -#if OPENSSL_API_COMPAT < 0x10200000L +#if OPENSSL_API_COMPAT < 0x30000000L /***** LONG ******************************************************************/ typedef struct { @@ -824,7 +824,7 @@ static int test_intern(const TEST_PACKAGE *package) return fail == 0; } -#if OPENSSL_API_COMPAT < 0x10200000L +#if OPENSSL_API_COMPAT < 0x30000000L static int test_long_32bit(void) { return test_intern(&long_test_package_32bit); @@ -858,7 +858,7 @@ static int test_uint64(void) int setup_tests(void) { -#if OPENSSL_API_COMPAT < 0x10200000L +#if OPENSSL_API_COMPAT < 0x30000000L ADD_TEST(test_long_32bit); ADD_TEST(test_long_64bit); #endif -- cgit v1.2.3