Fix tests of TEST tests, as it were

Fix warning/bug in rc5test
Remove useless/warning-only test from dsatest.

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

diff --git a/test/rc5test.c b/test/rc5test.c
index bd02f72353dd90c4ea1fc59ee9ce3d36caaee0e4..d806b2edde7e49eb250dcfd06014bf4e8be20020 100644 (file)
--- a/test/rc5test.c
+++ b/test/rc5test.c
@@ -216,7 +216,7 @@ static int test_rc5_cbc(int n)
         memcpy(ivb, &rc5_cbc_iv[n][0], 8);
         RC5_32_cbc_encrypt(buf, buf2, 8, &key, &ivb[0], RC5_DECRYPT);
         if (!TEST_mem_eq(&rc5_cbc_plain[n][0], sizeof(rc5_cbc_plain[0]),
-                         buf2, sizeof(buf2)) != 0)
+                         buf2, sizeof(buf2)))
             testresult = 0;
     }
 

diff --git a/test/recipes/15-test_dsa.t b/test/recipes/15-test_dsa.t
index 2fd236e875f4fbd09ff83ab255b5d06dd04f17a8..311b9b3e0a2dafccfb0ea3c2891e76c755c253f7 100644 (file)
--- a/test/recipes/15-test_dsa.t
+++ b/test/recipes/15-test_dsa.t
@@ -16,12 +16,11 @@ use OpenSSL::Test::Utils;
 
 setup("test_dsa");
 
-plan tests => 6;
+plan tests => 5;
 
 require_ok(srctop_file('test','recipes','tconversion.pl'));
 
 ok(run(test(["dsatest"])), "running dsatest");
-ok(run(test(["dsatest", "-app2_1"])), "running dsatest -app2_1");
 
  SKIP: {
      skip "Skipping dsa conversion test", 3