[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  292247ea04c5e7133d23d99ec31539d874e4f7b4 (commit)
      from  516decaef31a13e5bf1b6f855dc0fefe23d7eed9 (commit)


- Log -----------------------------------------------------------------
commit 292247ea04c5e7133d23d99ec31539d874e4f7b4
Author: Rich Salz <rsalz at openssl.org>
Date:   Thu May 4 12:03:57 2017 -0400

    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 at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3387)

-----------------------------------------------------------------------

Summary of changes:
 test/rc5test.c             | 2 +-
 test/recipes/15-test_dsa.t | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/test/rc5test.c b/test/rc5test.c
index bd02f72..d806b2e 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 2fd236e..311b9b3 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