commit a9998e2f67046d3f778d3c9d578ea56e183a638b
author Matt Caswell <matt@openssl.org> Thu Feb 16 17:09:28 2017 +0000
committer Matt Caswell <matt@openssl.org> Fri Feb 17 10:28:01 2017 +0000
tree 28cedfe5d3a3461596563b45f9ae46a9d01e4e5d
parent 4fbfe86ae3c5a829ea1a259330921bd5549223a5

Updates following review feedback

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2609)

ssl/ssl_lib.c

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index e8274a1..48c37b8 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -1721,7 +1721,7 @@
 int SSL_key_update(SSL *s, int updatetype)
 {
     /*
-     * TODO(TLS1.3): How will applications know whether TLSv1.3+ has been
+     * TODO(TLS1.3): How will applications know whether TLSv1.3 has been
      * negotiated, and that it is appropriate to call SSL_key_update() instead
      * of SSL_renegotiate().
      */

ssl/statem/statem_clnt.c

diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
index 88d7608..9f2e7af 100644
--- a/ssl/statem/statem_clnt.c
+++ b/ssl/statem/statem_clnt.c
@@ -735,7 +735,6 @@
     case TLS_ST_CW_KEY_UPDATE:
         if (statem_flush(s) != 1)
             return WORK_MORE_A;
-
         if (!tls13_update_key(s, 1))
             return WORK_ERROR;
         break;

ssl/statem/statem_srvr.c

diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index 8f3841c..0037e79 100644
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -843,7 +843,6 @@
     case TLS_ST_SW_KEY_UPDATE:
         if (statem_flush(s) != 1)
             return WORK_MORE_A;
-
         if (!tls13_update_key(s, 1))
             return WORK_ERROR;
         break;