]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Do not send the empty renegotiation info SCSV in QUIC
authorTomas Mraz <tomas@openssl.org>
Fri, 21 Apr 2023 15:19:27 +0000 (17:19 +0200)
committerTomas Mraz <tomas@openssl.org>
Tue, 2 May 2023 07:51:18 +0000 (09:51 +0200)
There is no point in sending that when min_proto_version is >= TLS1_3_VERSION.
So we set that during SSL_CTX initialization and skip adding the SCSV.

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Todd Short <todd.short@me.com>
(Merged from https://github.com/openssl/openssl/pull/20764)

ssl/statem/statem_clnt.c

index 1e3331941301bb549bf69c9ec6f7fecd3357baed..e7a0d8ccfdc7f6c928e63eee4ed17c21387cb514 100644 (file)
@@ -4027,7 +4027,9 @@ int ssl_cipher_list_to_bytes(SSL_CONNECTION *s, STACK_OF(SSL_CIPHER) *sk,
 {
     int i;
     size_t totlen = 0, len, maxlen, maxverok = 0;
-    int empty_reneg_info_scsv = !s->renegotiate;
+    int empty_reneg_info_scsv = !s->renegotiate
+                                && (SSL_CONNECTION_IS_DTLS(s)
+                                    || s->min_proto_version < TLS1_3_VERSION);
     SSL *ssl = SSL_CONNECTION_GET_SSL(s);
 
     /* Set disabled masks for this session */