[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  a7a7e6e3a647688be389b7d9c977b7fc74142fca (commit)
      from  f1a45f68bcdceaa2944d078cc65ffb0b3845c43e (commit)


- Log -----------------------------------------------------------------
commit a7a7e6e3a647688be389b7d9c977b7fc74142fca
Author: Pauli <pauli at openssl.org>
Date:   Sat May 8 22:05:45 2021 +1000

    Reduce the runtime/output from the gmdiff test
    
    Reduce from 1e6 iterations to 1e3.  Add additional cases to cover the same
    range although most intermediate values will be skipped.
    
    Fixes #15185
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15202)

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

Summary of changes:
 test/gmdifftest.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/test/gmdifftest.c b/test/gmdifftest.c
index 0d9b71a5c0..028816f6de 100644
--- a/test/gmdifftest.c
+++ b/test/gmdifftest.c
@@ -49,10 +49,12 @@ static int check_time(long offset)
 
 static int test_gmtime(int offset)
 {
-    return check_time(offset) &&
-           check_time(-offset) &&
-           check_time(offset * 1000L) &&
-           check_time(-offset * 1000L);
+    return check_time(offset)
+           && check_time(-offset)
+           && check_time(offset * 1000L)
+           && check_time(-offset * 1000L)
+           && check_time(offset * 1000000L)
+           && check_time(-offset * 1000000L);
 }
 
 int setup_tests(void)
@@ -60,6 +62,6 @@ int setup_tests(void)
     if (sizeof(time_t) < 8)
         TEST_info("Skipping; time_t is less than 64-bits");
     else
-        ADD_ALL_TESTS_NOSUBTEST(test_gmtime, 1000000);
+        ADD_ALL_TESTS_NOSUBTEST(test_gmtime, 1000);
     return 1;
 }