[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  1b39bc9bcf2c8a0eb1047529feb91ed00c8c6ff7 (commit)
      from  a21f4cec14664d8fc5f52dc42ab7119b696521a5 (commit)


- Log -----------------------------------------------------------------
commit 1b39bc9bcf2c8a0eb1047529feb91ed00c8c6ff7
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Oct 2 13:44:17 2018 +0100

    Fix the drbgtest with randomized ordering
    
    In drbgtest, test_set_defaults changes the default DRBGs. This works fine
    when tests are run in the normal order. However if
    OPENSSL_TEST_RAND_ORDER is defined then it may fail (dependent on the
    ordering). This environment variable is defined for one of the Travis
    tests, so this issue was causing intermittent travis test failures.
    
    [extended tests]
    
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/7338)

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

Summary of changes:
 test/drbgtest.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/test/drbgtest.c b/test/drbgtest.c
index 4e0c76f..f2054a8 100644
--- a/test/drbgtest.c
+++ b/test/drbgtest.c
@@ -1049,7 +1049,17 @@ static int test_set_defaults(void)
            && TEST_true(RAND_DRBG_uninstantiate(master))
            && TEST_int_eq(master->type, NID_aes_256_ctr)
            && TEST_int_eq(master->flags,
-                          RAND_DRBG_FLAG_MASTER|RAND_DRBG_FLAG_CTR_NO_DF);
+                          RAND_DRBG_FLAG_MASTER|RAND_DRBG_FLAG_CTR_NO_DF)
+
+           /* Reset back to the standard defaults */
+           && TEST_true(RAND_DRBG_set_defaults(RAND_DRBG_TYPE,
+                                               RAND_DRBG_FLAGS
+                                               | RAND_DRBG_FLAG_MASTER
+                                               | RAND_DRBG_FLAG_PUBLIC
+                                               | RAND_DRBG_FLAG_PRIVATE))
+           && TEST_true(RAND_DRBG_uninstantiate(master))
+           && TEST_true(RAND_DRBG_uninstantiate(public))
+           && TEST_true(RAND_DRBG_uninstantiate(private));
 }
 
 int setup_tests(void)