From: Hugo Landau <hlandau@openssl.org>
Date: Thu, 24 Aug 2023 10:28:17 +0000 (+0100)
Subject: QUIC APL: Fix stream backpressure conditions to use non-I/O errors
X-Git-Tag: openssl-3.2.0-alpha1~136
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a5f58b2cf0d7b2fa0451603a88c3976c657dae9;p=thirdparty%2Fopenssl.git

QUIC APL: Fix stream backpressure conditions to use non-I/O errors

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

diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt
index b725032254e..3eeaa6d5d57 100644
--- a/crypto/err/openssl.txt
+++ b/crypto/err/openssl.txt
@@ -1563,7 +1563,7 @@ SSL_R_SSL_SESSION_ID_HAS_BAD_LENGTH:303:ssl session id has bad length
 SSL_R_SSL_SESSION_ID_TOO_LONG:408:ssl session id too long
 SSL_R_SSL_SESSION_VERSION_MISMATCH:210:ssl session version mismatch
 SSL_R_STILL_IN_INIT:121:still in init
-SSL_R_STREAM_COUNT_LIMITED:395:stream count limited
+SSL_R_STREAM_COUNT_LIMITED:411:stream count limited
 SSL_R_STREAM_FINISHED:365:stream finished
 SSL_R_STREAM_RECV_ONLY:366:stream recv only
 SSL_R_STREAM_RESET:375:stream reset
diff --git a/include/openssl/sslerr.h b/include/openssl/sslerr.h
index 0a4079b5c80..e1eb9a5692c 100644
--- a/include/openssl/sslerr.h
+++ b/include/openssl/sslerr.h
@@ -290,7 +290,7 @@
 # define SSL_R_SSL_SESSION_ID_TOO_LONG                    408
 # define SSL_R_SSL_SESSION_VERSION_MISMATCH               210
 # define SSL_R_STILL_IN_INIT                              121
-# define SSL_R_STREAM_COUNT_LIMITED                       395
+# define SSL_R_STREAM_COUNT_LIMITED                       411
 # define SSL_R_STREAM_FINISHED                            365
 # define SSL_R_STREAM_RECV_ONLY                           366
 # define SSL_R_STREAM_RESET                               375
diff --git a/ssl/quic/quic_impl.c b/ssl/quic/quic_impl.c
index 5073bb1e6fa..71bd5e865b5 100644
--- a/ssl/quic/quic_impl.c
+++ b/ssl/quic/quic_impl.c
@@ -1764,7 +1764,7 @@ static SSL *quic_conn_stream_new(QCTX *ctx, uint64_t flags, int need_lock)
          * opened.
          */
         if (no_blocking || !qc_blocking_mode(qc)) {
-            QUIC_RAISE_NON_NORMAL_ERROR(ctx, SSL_R_STREAM_COUNT_LIMITED, NULL);
+            QUIC_RAISE_NON_IO_ERROR(ctx, SSL_R_STREAM_COUNT_LIMITED, NULL);
             goto err;
         }
 
@@ -1774,10 +1774,10 @@ static SSL *quic_conn_stream_new(QCTX *ctx, uint64_t flags, int need_lock)
         /* Blocking mode - wait until we can get a stream. */
         ret = block_until_pred(ctx->qc, quic_new_stream_wait, &args, 0);
         if (!quic_mutation_allowed(qc, /*req_active=*/1)) {
-            QUIC_RAISE_NON_NORMAL_ERROR(ctx, SSL_R_PROTOCOL_IS_SHUTDOWN, NULL);
+            QUIC_RAISE_NON_IO_ERROR(ctx, SSL_R_PROTOCOL_IS_SHUTDOWN, NULL);
             goto err; /* Shutdown before completion */
         } else if (ret <= 0) {
-            QUIC_RAISE_NON_NORMAL_ERROR(ctx, ERR_R_INTERNAL_ERROR, NULL);
+            QUIC_RAISE_NON_IO_ERROR(ctx, ERR_R_INTERNAL_ERROR, NULL);
             goto err; /* Non-protocol error */
         }
     }