diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/build.info | 10 | ||||
| -rw-r--r-- | test/endecoder_legacy_test.c | 2 | ||||
| -rw-r--r-- | test/recipes/04-test_encoder_decoder_legacy.t | 6 |
3 files changed, 11 insertions, 7 deletions
diff --git a/test/build.info b/test/build.info index bd87bf6a94..7f9e44b591 100644 --- a/test/build.info +++ b/test/build.info @@ -793,10 +793,12 @@ IF[{- !$disabled{tests} -}] INCLUDE[endecode_test]=.. ../include ../apps/include DEPEND[endecode_test]=../libcrypto.a libtestutil.a - PROGRAMS{noinst}=endecoder_legacy_test - SOURCE[endecoder_legacy_test]=endecoder_legacy_test.c - INCLUDE[endecoder_legacy_test]=.. ../include ../apps/include - DEPEND[endecoder_legacy_test]=../libcrypto.a libtestutil.a + IF[{- !$disabled{'deprecated-3.0'} -}] + PROGRAMS{noinst}=endecoder_legacy_test + SOURCE[endecoder_legacy_test]=endecoder_legacy_test.c + INCLUDE[endecoder_legacy_test]=.. ../include ../apps/include + DEPEND[endecoder_legacy_test]=../libcrypto.a libtestutil.a + ENDIF PROGRAMS{noinst}=namemap_internal_test SOURCE[namemap_internal_test]=namemap_internal_test.c diff --git a/test/endecoder_legacy_test.c b/test/endecoder_legacy_test.c index 6fd7b356cd..467c072b3e 100644 --- a/test/endecoder_legacy_test.c +++ b/test/endecoder_legacy_test.c @@ -166,7 +166,6 @@ static struct test_stanza_st { NULL, /* No PEM_read_bio_ECParameters */ (PEM_read_bio_of_void *)PEM_read_bio_EC_PUBKEY, }, #endif -#ifndef OPENSSL_NO_DEPRECATED_3_0 { "RSA", { "RSA", "type-specific" }, EVP_PKEY_RSA, (i2d_of_void *)i2d_RSAPrivateKey, (i2d_of_void *)i2d_RSAPublicKey, @@ -184,7 +183,6 @@ static struct test_stanza_st { (PEM_read_bio_of_void *)PEM_read_bio_RSAPublicKey, NULL, /* No PEM_read_bio_RSAparams */ (PEM_read_bio_of_void *)PEM_read_bio_RSA_PUBKEY } -#endif }; /* diff --git a/test/recipes/04-test_encoder_decoder_legacy.t b/test/recipes/04-test_encoder_decoder_legacy.t index 9881322628..ef252a3766 100644 --- a/test/recipes/04-test_encoder_decoder_legacy.t +++ b/test/recipes/04-test_encoder_decoder_legacy.t @@ -11,12 +11,16 @@ use warnings; use OpenSSL::Test::Simple; use OpenSSL::Test qw/:DEFAULT srctop_file bldtop_dir/; +use OpenSSL::Test::Utils; use Cwd qw(abs_path); -setup("test_encode_legacy"); +setup("test_encoder_decoder_legacy"); +plan skip_all => "Not available in a no-deprecated build" + if disabled("deprecated"); plan tests => 1; + $ENV{OPENSSL_MODULES} = abs_path(bldtop_dir("providers")); $ENV{OPENSSL_CONF} = abs_path(srctop_file("test", "default-and-legacy.cnf")); |