Adapt all build.info and test recipes to the new $disabled{'deprecated-x.y'}

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11027)

diff --git a/crypto/des/build.info b/crypto/des/build.info
index 8ce3daf37e76f26c9172427330ce19dd8f066acf..1fbbcdf2f988856308b143c4f844fbaefb1f0f37 100644 (file)
--- a/crypto/des/build.info
+++ b/crypto/des/build.info
@@ -25,9 +25,9 @@ SOURCE[../../providers/libfips.a]=$COMMON
 DEFINE[../../libcrypto]=$DESDEF
 DEFINE[../../providers/libfips.a]=$DESDEF
 
-IF[{- $disabled{"deprecated"}
-      && !$disabled{"mdc2"}
-      && (defined $config{"api"} && $config{"api"} >= 30000) -}]
+# When all deprecated symbols are removed, libcrypto doesn't export the
+# DES functions, so we must include them directly in liblegacy.a
+IF[{- $disabled{'deprecated-3.0'} && !$disabled{"mdc2"} -}]
   SOURCE[../../providers/liblegacy.a]=set_key.c $DESASM
   DEFINE[../../providers/liblegacy.a]=$DESDEF
 ENDIF

diff --git a/crypto/evp/build.info b/crypto/evp/build.info
index 7972706f86a9c74d5390ccbe3d25a914bdfaea9f..846cd65513565aeb3abee9e12535e69f56e506f8 100644 (file)
--- a/crypto/evp/build.info
+++ b/crypto/evp/build.info
@@ -19,7 +19,7 @@ SOURCE[../../libcrypto]=$COMMON\
         pkey_mac.c \
         legacy_sha.c
 
-IF[{- !$disabled{deprecated} || $config{api} < 30000 -}]
+IF[{- !$disabled{'deprecated-3.0'} -}]
   SOURCE[../../libcrypto]=p_enc.c p_dec.c
 ENDIF
 

diff --git a/crypto/md2/build.info b/crypto/md2/build.info
index d682cfa658bb82d1ac39aa8bd758049ff6cff0e1..a1bb42109457c214e2674b3e2fbb5701407faed6 100644 (file)
--- a/crypto/md2/build.info
+++ b/crypto/md2/build.info
@@ -4,7 +4,6 @@ SOURCE[../../libcrypto]=md2_dgst.c md2_one.c
 
 # When all deprecated symbols are removed, libcrypto doesn't export the
 # MD2 functions, so we must include them directly in liblegacy.a
-IF[{- $disabled{"deprecated"}
-      && (defined $config{"api"} && $config{"api"} >= 30000) -}]
+IF[{- $disabled{'deprecated-3.0'} -}]
   SOURCE[../../providers/liblegacy.a]=md2_dgst.c md2_one.c
 ENDIF

diff --git a/crypto/md4/build.info b/crypto/md4/build.info
index 7b36a0421e0e5ead90dd766da889e999b3f104da..bed9c0bd40cade79702409f619c0c043e9d6baab 100644 (file)
--- a/crypto/md4/build.info
+++ b/crypto/md4/build.info
@@ -4,7 +4,6 @@ SOURCE[../../libcrypto]=md4_dgst.c md4_one.c
 
 # When all deprecated symbols are removed, libcrypto doesn't export the
 # MD4 functions, so we must include them directly in liblegacy.a
-IF[{- $disabled{"deprecated"}
-      && (defined $config{"api"} && $config{"api"} >= 30000) -}]
+IF[{- $disabled{'deprecated-3.0'} -}]
   SOURCE[../../providers/liblegacy.a]=md4_dgst.c md4_one.c
 ENDIF

diff --git a/crypto/mdc2/build.info b/crypto/mdc2/build.info
index 54df2625147a34f0980412cd82a6fef463b22b8d..76aa0705e465a2d55767518f89aa8bff2af71211 100644 (file)
--- a/crypto/mdc2/build.info
+++ b/crypto/mdc2/build.info
@@ -4,7 +4,6 @@ SOURCE[../../libcrypto]=mdc2dgst.c mdc2_one.c
 
 # When all deprecated symbols are removed, libcrypto doesn't export the
 # MDC2 functions, so we must include them directly in liblegacy.a
-IF[{- $disabled{"deprecated"}
-      && (defined $config{"api"} && $config{"api"} >= 30000) -}]
+IF[{- $disabled{'deprecated-3.0'} -}]
   SOURCE[../../providers/liblegacy.a]=mdc2dgst.c mdc2_one.c
 ENDIF

diff --git a/crypto/ripemd/build.info b/crypto/ripemd/build.info
index 055da5dab8f79340d63dbfb16d87795251e208e1..4cc5b3a2ebaf6747db1dd217bbe721917942d162 100644 (file)
--- a/crypto/ripemd/build.info
+++ b/crypto/ripemd/build.info
@@ -21,8 +21,7 @@ DEFINE[../../libcrypto]=$RMD160DEF
 
 # When all deprecated symbols are removed, libcrypto doesn't export the
 # RIPEMD160 functions, so we must include them directly in liblegacy.a
-IF[{- $disabled{"deprecated"}
-      && (defined $config{"api"} && $config{"api"} >= 30000) -}]
+IF[{- $disabled{'deprecated-3.0'} -}]
   SOURCE[../../providers/liblegacy.a]=rmd_dgst.c rmd_one.c $RMD160ASM
   DEFINE[../../providers/liblegacy.a]=$RMD160DEF
 ENDIF

diff --git a/crypto/whrlpool/build.info b/crypto/whrlpool/build.info
index c48971885865cdf5a28806ddff1345697611fbd5..471b8acf2c15352f1be1a14961df4014c765617f 100644 (file)
--- a/crypto/whrlpool/build.info
+++ b/crypto/whrlpool/build.info
@@ -26,8 +26,7 @@ DEFINE[../../libcrypto]=$WPDEF
 
 # When all deprecated symbols are removed, libcrypto doesn't export the
 # WHIRLPOOL functions, so we must include them directly in liblegacy.a
-IF[{- $disabled{"deprecated"}
-      && (defined $config{"api"} && $config{"api"} >= 30000) -}]
+IF[{- $disabled{'deprecated-3.0'} -}]
   SOURCE[../../providers/liblegacy.a]=wp_dgst.c $WPASM
   DEFINE[../../providers/liblegacy.a]=$WPDEF
 ENDIF

diff --git a/test/build.info b/test/build.info
index 9129d0651debd375863168b81f7017bcfb78d105..5c606b364c684d607501626d5efa3962dae0690b 100644 (file)
--- 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 1c7c005f2231450d3a0098a40b5bbbf076612b0d..138046b2cd08dcb25cbda88d61e8ed2246a27b91 100644 (file)
--- 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 b1b909db7a2655f7dfaf23a5a7d57dab78a0cc65..3be9721e26154ca6a917a923b42ea5a81a0222dd 100644 (file)
--- 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 efbb0e8b900a20ec0c44d2d436c4d9c06177db3d..433eb23aa51ca5818ae352993fdbea0636e98cb4 100644 (file)
--- 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 fc22df71b4a5db19e5db6ea8cf42b0b594b3a05d..50ccdd7428ce724921078e8ffdf5e30cd7b5045a 100644 (file)
--- 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");