diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/build.info | 3 | ||||
| -rw-r--r-- | test/recipes/05-test_bf.t | 3 | ||||
| -rw-r--r-- | test/recipes/05-test_cast.t | 3 | ||||
| -rw-r--r-- | test/recipes/20-test_passwd.t | 8 | ||||
| -rw-r--r-- | test/recipes/90-test_ige.t | 3 |
5 files changed, 9 insertions, 11 deletions
diff --git a/test/build.info b/test/build.info index 9129d0651d..5c606b364c 100644 --- a/test/build.info +++ b/test/build.info @@ -171,8 +171,7 @@ IF[{- !$disabled{tests} -}] INCLUDE[evp_pkey_provided_test]=../include ../apps/include DEPEND[evp_pkey_provided_test]=../libcrypto libtestutil.a - IF[{- !$disabled{"deprecated"} - || (defined $config{"api"} && $config{"api"} < 30000) -}] + IF[{- !$disabled{'deprecated-3.0'} -}] PROGRAMS{noinst}=igetest bftest casttest SOURCE[igetest]=igetest.c diff --git a/test/recipes/05-test_bf.t b/test/recipes/05-test_bf.t index 1c7c005f22..138046b2cd 100644 --- a/test/recipes/05-test_bf.t +++ b/test/recipes/05-test_bf.t @@ -16,7 +16,6 @@ use OpenSSL::Test::Utils; setup("test_bf"); plan skip_all => "Low-level Blowfish APIs are disabled in this build" - if disabled("deprecated") - && (!defined config("api") || config("api") >= 30000); + if disabled('deprecated-3.0'); simple_test("test_bf", "bftest", "bf"); diff --git a/test/recipes/05-test_cast.t b/test/recipes/05-test_cast.t index b1b909db7a..3be9721e26 100644 --- a/test/recipes/05-test_cast.t +++ b/test/recipes/05-test_cast.t @@ -17,7 +17,6 @@ use OpenSSL::Test::Utils; setup("test_cast"); plan skip_all => "Low-level CAST APIs are disabled in this build" - if disabled("deprecated") - && (!defined config("api") || config("api") >= 30000); + if disabled('deprecated-3.0'); simple_test("test_cast", "casttest", "cast"); diff --git a/test/recipes/20-test_passwd.t b/test/recipes/20-test_passwd.t index efbb0e8b90..433eb23aa5 100644 --- a/test/recipes/20-test_passwd.t +++ b/test/recipes/20-test_passwd.t @@ -76,11 +76,12 @@ my @sha_tests = expected => '$6$rounds=1000$roundstoolow$kUMsbe306n21p9R.FRkW3IGn.S9NPN0x50YhH1xhLsPuWGsUSklZt58jaTfF4ZEQpyUNGc0dqbpBYYBaHHrsX.' } ); -plan tests => (disabled("des") || disabled("deprecated") ? 9 : 11) + scalar @sha_tests; +plan tests => (disabled("des") || disabled('deprecated-3.0') ? 9 : 11) + scalar @sha_tests; ok(compare1stline_re([qw{openssl passwd password}], '^.{13}\R$'), - 'crypt password with random salt') if !disabled("des") && !disabled("deprecated"); + 'crypt password with random salt') + if !disabled("des") && !disabled('deprecated-3.0'); ok(compare1stline_re([qw{openssl passwd -1 password}], '^\$1\$.{8}\$.{22}\R$'), 'BSD style MD5 password with random salt'); ok(compare1stline_re([qw{openssl passwd -apr1 password}], '^\$apr1\$.{8}\$.{22}\R$'), @@ -91,7 +92,8 @@ ok(compare1stline_re([qw{openssl passwd -6 password}], '^\$6\$.{16}\$.{86}\R$'), 'Apache SHA512 password with random salt'); ok(compare1stline([qw{openssl passwd -salt xx password}], 'xxj31ZMTZzkVA'), - 'crypt password with salt xx') if !disabled("des") && !disabled("deprecated"); + 'crypt password with salt xx') + if !disabled("des") && !disabled('deprecated-3.0'); ok(compare1stline([qw{openssl passwd -salt xxxxxxxx -1 password}], '$1$xxxxxxxx$UYCIxa628.9qXjpQCjM4a.'), 'BSD style MD5 password with salt xxxxxxxx'); ok(compare1stline([qw{openssl passwd -salt xxxxxxxx -apr1 password}], '$apr1$xxxxxxxx$dxHfLAsjHkDRmG83UXe8K0'), diff --git a/test/recipes/90-test_ige.t b/test/recipes/90-test_ige.t index fc22df71b4..50ccdd7428 100644 --- a/test/recipes/90-test_ige.t +++ b/test/recipes/90-test_ige.t @@ -17,7 +17,6 @@ use OpenSSL::Test::Utils; setup("test_ige"); plan skip_all => "AES_ige support is disabled in this build" - if disabled("deprecated") - && (!defined config("api") || config("api") >= 30000); + if disabled('deprecated-3.0'); simple_test("test_ige", "igetest"); |