提交 a9998e2f 编写于 作者: M Matt Caswell

Updates following review feedback

Reviewed-by: NRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2609)
上级 4fbfe86a
...@@ -1721,7 +1721,7 @@ int SSL_shutdown(SSL *s) ...@@ -1721,7 +1721,7 @@ int SSL_shutdown(SSL *s)
int SSL_key_update(SSL *s, int updatetype) 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 * negotiated, and that it is appropriate to call SSL_key_update() instead
* of SSL_renegotiate(). * of SSL_renegotiate().
*/ */
......
...@@ -735,7 +735,6 @@ WORK_STATE ossl_statem_client_post_work(SSL *s, WORK_STATE wst) ...@@ -735,7 +735,6 @@ WORK_STATE ossl_statem_client_post_work(SSL *s, WORK_STATE wst)
case TLS_ST_CW_KEY_UPDATE: case TLS_ST_CW_KEY_UPDATE:
if (statem_flush(s) != 1) if (statem_flush(s) != 1)
return WORK_MORE_A; return WORK_MORE_A;
if (!tls13_update_key(s, 1)) if (!tls13_update_key(s, 1))
return WORK_ERROR; return WORK_ERROR;
break; break;
......
...@@ -843,7 +843,6 @@ WORK_STATE ossl_statem_server_post_work(SSL *s, WORK_STATE wst) ...@@ -843,7 +843,6 @@ WORK_STATE ossl_statem_server_post_work(SSL *s, WORK_STATE wst)
case TLS_ST_SW_KEY_UPDATE: case TLS_ST_SW_KEY_UPDATE:
if (statem_flush(s) != 1) if (statem_flush(s) != 1)
return WORK_MORE_A; return WORK_MORE_A;
if (!tls13_update_key(s, 1)) if (!tls13_update_key(s, 1))
return WORK_ERROR; return WORK_ERROR;
break; break;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册