[openssl] master update

[tmraz at fedoraproject.org]

The branch master has been updated
       via  310553591cd8fe7ea5f223b9cc41a283f8e6cbf6 (commit)
      from  eb173822b2c02122844f4ffe89e38fe8e6d04697 (commit)


- Log -----------------------------------------------------------------
commit 310553591cd8fe7ea5f223b9cc41a283f8e6cbf6
Author: Rich Salz <rsalz at akamai.com>
Date:   Sat Nov 2 13:02:37 2019 -0400

    Add ssl_ctx_test to test suite.
    
    Also fix the test as min version > max version is allowed because
    the API calls to set min and max versions are separate and there
    can be legitimately a temporary situation when the condition is
    true even with correctly working application.
    
    The failure in this condition will be detected only during
    a handshake attempt.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    (Merged from https://github.com/openssl/openssl/pull/10337)

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

Summary of changes:
 test/recipes/{05-test_rand.t => 71-test_ssl_ctx.t} | 7 +++----
 test/ssl_ctx_test.c                                | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)
 copy test/recipes/{05-test_rand.t => 71-test_ssl_ctx.t} (79%)

diff --git a/test/recipes/05-test_rand.t b/test/recipes/71-test_ssl_ctx.t
similarity index 79%
copy from test/recipes/05-test_rand.t
copy to test/recipes/71-test_ssl_ctx.t
index f376edd18a..6d5fc7a338 100644
--- a/test/recipes/05-test_rand.t
+++ b/test/recipes/71-test_ssl_ctx.t
@@ -10,8 +10,7 @@ use strict;
 use warnings;
 use OpenSSL::Test;
 
-plan tests => 2;
-setup("test_rand");
+setup("ssl_ctx_test");
 
-ok(run(test(["drbgtest"])));
-ok(run(test(["drbg_cavs_test"])));
+plan tests => 1;
+ok(run(test(["ssl_ctx_test"])));
diff --git a/test/ssl_ctx_test.c b/test/ssl_ctx_test.c
index 87d476d9ec..58ca60a788 100644
--- a/test/ssl_ctx_test.c
+++ b/test/ssl_ctx_test.c
@@ -24,7 +24,7 @@ static const version_test version_testdata[] = {
     {0,              0,              1, 1, 0,              0},
     {TLS1_VERSION,   TLS1_2_VERSION, 1, 1, TLS1_VERSION,   TLS1_2_VERSION},
     {TLS1_2_VERSION, TLS1_2_VERSION, 1, 1, TLS1_2_VERSION, TLS1_2_VERSION},
-    {TLS1_2_VERSION, TLS1_1_VERSION, 1, 0, TLS1_2_VERSION, 0},
+    {TLS1_2_VERSION, TLS1_1_VERSION, 1, 1, TLS1_2_VERSION, TLS1_1_VERSION},
     {7,              42,             0, 0, 0,              0},
 };