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 /test/asn1_encode_test.c | |
| parent | a6a4d0acd23b3fc85041d9096b67bcf18ccb635c (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 'test/asn1_encode_test.c')
| -rw-r--r-- | test/asn1_encode_test.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/asn1_encode_test.c b/test/asn1_encode_test.c index 64f8f1754c..4ff8a20ff4 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_3 +#ifndef OPENSSL_NO_DEPRECATED_3_0 /***** LONG ******************************************************************/ typedef struct { @@ -824,7 +824,7 @@ static int test_intern(const TEST_PACKAGE *package) return fail == 0; } -#if !OPENSSL_API_3 +#ifndef OPENSSL_NO_DEPRECATED_3_0 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_3 +#ifndef OPENSSL_NO_DEPRECATED_3_0 ADD_TEST(test_long_32bit); ADD_TEST(test_long_64bit); #endif |