From: Matt Caswell <matt@openssl.org>
Date: Fri, 10 Mar 2023 14:46:52 +0000 (+0000)
Subject: Defer unknown QUIC ctrls to the SSL object for TLS
X-Git-Tag: openssl-3.2.0-alpha1~1137
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f8ffab0d52fc5e37d92c99e4463d76174e869930;p=thirdparty%2Fopenssl.git

Defer unknown QUIC ctrls to the SSL object for TLS

If the QUIC oject receives a ctrl it does not recognise, the chances are
it is intended for the underlying SSL object - so we forward unknown ctrls
there.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20514)
---

diff --git a/ssl/quic/quic_impl.c b/ssl/quic/quic_impl.c
index 72ea5118aff..4c34ab8e404 100644
--- a/ssl/quic/quic_impl.c
+++ b/ssl/quic/quic_impl.c
@@ -537,7 +537,8 @@ long ossl_quic_ctrl(SSL *s, int cmd, long larg, void *parg)
         qc->ssl_mode &= ~(uint32_t)larg;
         return qc->ssl_mode;
     default:
-        return 0;
+        /* Probably a TLS related ctrl. Defer to our internal SSL object */
+        return SSL_ctrl(qc->tls, cmd, larg, parg);
     }
 }