Disable requests for renegotiation in TLSv1.3

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

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 8e6a14393c731a7b82c8e0f0a7710dfed88b4e01..e9b566bea8bb2060af9768a6d2a9dbdfae8b4934 100644 (file)
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -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;