[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  6862de63d469f3148a2ff5a04a6b9ab6413bd5ac (commit)
       via  447cc0ad732858f3ab80b2dc52f15fd045b25363 (commit)
      from  ac98d3860206bd31fd484baf163398bfb41e8595 (commit)


- Log -----------------------------------------------------------------
commit 6862de63d469f3148a2ff5a04a6b9ab6413bd5ac
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Apr 23 17:40:10 2018 +0100

    Add a test to verify the ClientHello version is the same in a reneg
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6059)

commit 447cc0ad732858f3ab80b2dc52f15fd045b25363
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Apr 23 17:14:47 2018 +0100

    In a reneg use the same client_version we used last time
    
    In 1.0.2 and below we always send the same client_version in a reneg
    ClientHello that we sent the first time around, regardless of what
    version eventually gets negotiated. According to a comment in
    statem_clnt.c this is a workaround for some buggy servers that choked if
    we changed the version used in the RSA encrypted premaster secret.
    
    In 1.1.0+ this behaviour no longer occurs. This restores the original
    behaviour.
    
    Fixes #1651
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6059)

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

Summary of changes:
 ssl/statem/statem_lib.c              |  7 +++++++
 test/recipes/70-test_renegotiation.t | 30 +++++++++++++++++++++++++++++-
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/ssl/statem/statem_lib.c b/ssl/statem/statem_lib.c
index 269ba85..49b4443 100644
--- a/ssl/statem/statem_lib.c
+++ b/ssl/statem/statem_lib.c
@@ -2004,6 +2004,13 @@ int ssl_set_client_hello_version(SSL *s)
 {
     int ver_min, ver_max, ret;
 
+    /*
+     * In a renegotiation we always send the same client_version that we sent
+     * last time, regardless of which version we eventually negotiated.
+     */
+    if (!SSL_IS_FIRST_HANDSHAKE(s))
+        return 0;
+
     ret = ssl_get_min_max_version(s, &ver_min, &ver_max);
 
     if (ret != 0)
diff --git a/test/recipes/70-test_renegotiation.t b/test/recipes/70-test_renegotiation.t
index 0951487..734f1cd 100644
--- a/test/recipes/70-test_renegotiation.t
+++ b/test/recipes/70-test_renegotiation.t
@@ -38,7 +38,7 @@ my $proxy = TLSProxy::Proxy->new(
 $proxy->clientflags("-no_tls1_3");
 $proxy->reneg(1);
 $proxy->start() or plan skip_all => "Unable to start up Proxy for tests";
-plan tests => 2;
+plan tests => 3;
 ok(TLSProxy::Message->success(), "Basic renegotiation");
 
 #Test 2: Client does not send the Reneg SCSV. Reneg should fail
@@ -49,6 +49,34 @@ $proxy->reneg(1);
 $proxy->start();
 ok(TLSProxy::Message->fail(), "No client SCSV");
 
+SKIP: {
+    skip "TLSv1.2 or TLSv1.1 disabled", 1
+        if disabled("tls1_2") || disabled("tls1_1");
+    #Test 3: Check that the ClientHello version remains the same in the reneg
+    #        handshake
+    $proxy->clear();
+    $proxy->filter(undef);
+    $proxy->clientflags("-no_tls1_3");
+    $proxy->serverflags("-no_tls1_3 -no_tls1_2");
+    $proxy->reneg(1);
+    $proxy->start();
+    my $chversion;
+    my $chmatch = 0;
+    foreach my $message (@{$proxy->message_list}) {
+        if ($message->mt == TLSProxy::Message::MT_CLIENT_HELLO) {
+            if (!defined $chversion) {
+                $chversion = $message->client_version;
+            } else {
+                if ($chversion == $message->client_version) {
+                    $chmatch = 1;
+                }
+            }
+        }
+    }
+    ok(TLSProxy::Message->success() && $chmatch,
+       "Check ClientHello version is the same");
+}
+
 sub reneg_filter
 {
     my $proxy = shift;