summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRich Salz <rsalz@openssl.org>2017-05-04 18:03:57 +0200
committerRich Salz <rsalz@openssl.org>2017-05-04 18:08:48 +0200
commit292247ea04c5e7133d23d99ec31539d874e4f7b4 (patch)
tree04abd5aa6c424c61bbbfd031a81f426dd85c7d86
parentTest framework output improvement. (diff)
downloadopenssl-292247ea04c5e7133d23d99ec31539d874e4f7b4.tar.xz
openssl-292247ea04c5e7133d23d99ec31539d874e4f7b4.zip
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)
-rw-r--r--test/rc5test.c2
-rw-r--r--test/recipes/15-test_dsa.t3
2 files changed, 2 insertions, 3 deletions
diff --git a/test/rc5test.c b/test/rc5test.c
index bd02f72353..d806b2edde 100644
--- 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 2fd236e875..311b9b3e0a 100644
--- 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