Disable requests for renegotiation in TLSv1.3
authorMatt Caswell <matt@openssl.org>
Wed, 11 Jan 2017 16:29:38 +0000 (16:29 +0000)
committerMatt Caswell <matt@openssl.org>
Mon, 30 Jan 2017 10:17:01 +0000 (10:17 +0000)
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2259)

ssl/ssl_lib.c

index 8e6a143..e9b566b 100644 (file)
@@ -1716,6 +1716,10 @@ int SSL_shutdown(SSL *s)
 
 int SSL_renegotiate(SSL *s)
 {
+    /* Do nothing in TLS1.3 */
+    if (SSL_IS_TLS13(s))
+        return 1;
+
     if (s->renegotiate == 0)
         s->renegotiate = 1;
 
@@ -1726,6 +1730,10 @@ int SSL_renegotiate(SSL *s)
 
 int SSL_renegotiate_abbreviated(SSL *s)
 {
+    /* Do nothing in TLS1.3 */
+    if (SSL_IS_TLS13(s))
+        return 1;
+
     if (s->renegotiate == 0)
         s->renegotiate = 1;