提交 2c0980d2 编写于 作者: M Matt Caswell

Make calls to SSL_renegotiate() error out for TLSv1.3

When we have support for KeyUpdate we might consider doing that instead.
Reviewed-by: NRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2259)
上级 ddf6ec00
......@@ -1716,9 +1716,12 @@ int SSL_shutdown(SSL *s)
int SSL_renegotiate(SSL *s)
{
/* Do nothing in TLS1.3 */
/*
* TODO(TLS1.3): Return an error for now. Perhaps we should do a KeyUpdate
* instead when we support that?
*/
if (SSL_IS_TLS13(s))
return 1;
return 0;
if (s->renegotiate == 0)
s->renegotiate = 1;
......@@ -1730,9 +1733,12 @@ int SSL_renegotiate(SSL *s)
int SSL_renegotiate_abbreviated(SSL *s)
{
/* Do nothing in TLS1.3 */
/*
* TODO(TLS1.3): Return an error for now. Perhaps we should do a KeyUpdate
* instead when we support that?
*/
if (SSL_IS_TLS13(s))
return 1;
return 0;
if (s->renegotiate == 0)
s->renegotiate = 1;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册