[openssl-commits] [openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  b1522fa5ef676b7af0128eab3eee608af3416182 (commit)
      from  03cdfe1efaf2a3b5192b8cb3ef331939af7bfeb8 (commit)


- Log -----------------------------------------------------------------
commit b1522fa5ef676b7af0128eab3eee608af3416182
Author: Pauli <paul.dale at oracle.com>
Date:   Fri Dec 21 12:03:19 2018 +1000

    Address a bug in the DRBG tests where the reseeding wasn't properly
    reinstantiating the DRBG.
    
    Bug reported by Doug Gibbons.
    
    Reviewed-by: Paul Yang <yang.yang at baishancloud.com>
    (Merged from https://github.com/openssl/openssl/pull/8184)

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

Summary of changes:
 test/drbgtest.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/drbgtest.c b/test/drbgtest.c
index c788f19..362a1d2 100644
--- a/test/drbgtest.c
+++ b/test/drbgtest.c
@@ -429,7 +429,7 @@ static int error_check(DRBG_SELFTEST_DATA *td)
      */
 
     /* Test explicit reseed with too large additional input */
-    if (!init(drbg, td, &t)
+    if (!instantiate(drbg, td, &t)
             || RAND_DRBG_reseed(drbg, td->adin, drbg->max_adinlen + 1, 0) > 0)
         goto err;
 
@@ -440,7 +440,7 @@ static int error_check(DRBG_SELFTEST_DATA *td)
         goto err;
 
     /* Test explicit reseed with too much entropy */
-    if (!init(drbg, td, &t))
+    if (!instantiate(drbg, td, &t))
         goto err;
     t.entropylen = drbg->max_entropylen + 1;
     if (!TEST_int_le(RAND_DRBG_reseed(drbg, td->adin, td->adinlen, 0), 0)
@@ -448,7 +448,7 @@ static int error_check(DRBG_SELFTEST_DATA *td)
         goto err;
 
     /* Test explicit reseed with too little entropy */
-    if (!init(drbg, td, &t))
+    if (!instantiate(drbg, td, &t))
         goto err;
     t.entropylen = drbg->min_entropylen - 1;
     if (!TEST_int_le(RAND_DRBG_reseed(drbg, td->adin, td->adinlen, 0), 0)