From: Hugo Landau <hlandau@openssl.org>
Date: Fri, 28 Apr 2023 15:56:34 +0000 (+0100)
Subject: QUIC QSM: Correct the logic for determining stream count limits
X-Git-Tag: openssl-3.2.0-alpha1~785
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8142d2ce8383329e6a71639d154191c1515ba55;p=thirdparty%2Fopenssl.git

QUIC QSM: Correct the logic for determining stream count limits

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

diff --git a/ssl/quic/quic_stream_map.c b/ssl/quic/quic_stream_map.c
index 138a063bf62..be2505d55ec 100644
--- a/ssl/quic/quic_stream_map.c
+++ b/ssl/quic/quic_stream_map.c
@@ -280,8 +280,8 @@ void ossl_quic_stream_map_update_state(QUIC_STREAM_MAP *qsm, QUIC_STREAM *s)
     int should_be_active, allowed_by_stream_limit = 1;
 
     if (qsm->get_stream_limit_cb != NULL
-        && (s->type & QUIC_STREAM_INITIATOR_CLIENT) != 0) {
-        int uni = ((s->type & QUIC_STREAM_DIR_UNI) != 0);
+        && ossl_quic_stream_is_server_init(s) == qsm->is_server) {
+        int uni = !ossl_quic_stream_is_bidi(s);
         uint64_t stream_limit, stream_ordinal = s->id >> 2;
 
         stream_limit