Updates following review feedback
authorMatt Caswell <matt@openssl.org>
Thu, 16 Feb 2017 17:09:28 +0000 (17:09 +0000)
committerMatt Caswell <matt@openssl.org>
Fri, 17 Feb 2017 10:28:01 +0000 (10:28 +0000)
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2609)

ssl/ssl_lib.c
ssl/statem/statem_clnt.c
ssl/statem/statem_srvr.c

index e8274a1..48c37b8 100644 (file)
@@ -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().
      */
index 88d7608..9f2e7af 100644 (file)
@@ -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;
index 8f3841c..0037e79 100644 (file)
@@ -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;