[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  83ccead4d0fb496c8f00ee53c28e957b8cab4181 (commit)
      from  7bbb00500a1db556ad900e3b307425c50cd515a8 (commit)


- Log -----------------------------------------------------------------
commit 83ccead4d0fb496c8f00ee53c28e957b8cab4181
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Nov 28 10:15:15 2017 +0000

    Fix lshift tests
    
    Commit 30bea14be6 converted bntest.c to the new TEST framework.
    Unfortunately a missing "goto err" means that the lshift tests skip
    the actual bit that tests them. Replacing the "goto err" reveals that
    the conversion also broke the tests. This adds back the missing "goto err"
    and fixes the tests.
    
    Fixes #4808
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4809)

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

Summary of changes:
 test/bntest.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/bntest.c b/test/bntest.c
index 6b7f824..9eda5bd 100644
--- a/test/bntest.c
+++ b/test/bntest.c
@@ -1089,7 +1089,9 @@ static int file_lshift(STANZA *s)
 
     if (!TEST_ptr(a = getBN(s, "A"))
             || !TEST_ptr(lshift = getBN(s, "LShift"))
-            || !TEST_ptr(ret = BN_new()))
+            || !TEST_ptr(ret = BN_new())
+            || !getint(s, &n, "N"))
+        goto err;
 
     if (!TEST_true(BN_lshift(ret, a, n))
             || !equalBN("A << N", lshift, ret)