From: Hugo Landau <hlandau@openssl.org>
Date: Tue, 2 May 2023 07:29:43 +0000 (+0100)
Subject: QUIC MSST: Clarify default XSO transitions
X-Git-Tag: openssl-3.2.0-alpha1~824
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a61a96c1e43694199f5ec0887d0ad21a4650e3f;p=thirdparty%2Fopenssl.git

QUIC MSST: Clarify default XSO transitions

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20765)
---

diff --git a/ssl/quic/quic_impl.c b/ssl/quic/quic_impl.c
index 18a647bfa55..0826a170d43 100644
--- a/ssl/quic/quic_impl.c
+++ b/ssl/quic/quic_impl.c
@@ -520,7 +520,13 @@ static void qc_set_default_xso_keep_ref(QUIC_CONNECTION *qc, QUIC_XSO *xso,
              * Changing from not having a default XSO to having one. The new XSO
              * will have had a reference to the QC we need to drop to avoid a
              * circular reference.
+             *
+             * Currently we never change directly from one default XSO to
+             * another, though this function would also still be correct if this
+             * weren't the case.
              */
+            assert(*old_xso == NULL);
+
             CRYPTO_DOWN_REF(&qc->ssl.references, &refs, &qc->ssl.lock);
             assert(refs > 0);
         }