Updates following review feedback

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

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index e8274a1c05480ee512d19b6573bbbd3476eec8fc..48c37b821768ffabf92128f75b91b3c5fd03f3dd 100644 (file)
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -1721,7 +1721,7 @@ int SSL_shutdown(SSL *s)
 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().
      */

diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
index 88d76085673d8912a83c3eaed14a24563dfc0227..9f2e7afd29e69fdfcb5e3c1c110e15faee9a4b30 100644 (file)
--- a/ssl/statem/statem_clnt.c
+++ b/ssl/statem/statem_clnt.c
@@ -735,7 +735,6 @@ WORK_STATE ossl_statem_client_post_work(SSL *s, WORK_STATE wst)
     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;

diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index 8f3841cc849620a6215533decb7ed09911a12bf0..0037e79d2ad88d7465354b69063c02da1cddcd0c 100644 (file)
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -843,7 +843,6 @@ WORK_STATE ossl_statem_server_post_work(SSL *s, WORK_STATE wst)
     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;