From: Hugo Landau <hlandau@openssl.org>
Date: Thu, 4 Apr 2024 11:12:45 +0000 (+0100)
Subject: QUIC APL: Revise SSL_pending and SSL_has_pending handling for s_client compat
X-Git-Tag: openssl-3.5.0-alpha1~408
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a6bb6b639a47cca2b5a505737f7e23d6fdbbb39;p=thirdparty%2Fopenssl.git

QUIC APL: Revise SSL_pending and SSL_has_pending handling for s_client compat

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/24037)
---

diff --git a/ssl/quic/quic_impl.c b/ssl/quic/quic_impl.c
index 0d61bc949d6..65a8fcd9b3d 100644
--- a/ssl/quic/quic_impl.c
+++ b/ssl/quic/quic_impl.c
@@ -313,7 +313,7 @@ static int expect_quic_as(const SSL *s, QCTX *ctx, uint32_t flags)
                 goto err;
 
             if ((flags & QCTX_REMOTE_INIT) != 0) {
-                if (!qc_wait_for_default_xso_for_read(ctx))
+                if (!qc_wait_for_default_xso_for_read(ctx, /*peek=*/0))
                     goto err;
             } else {
                 if (!qc_try_create_default_xso_for_write(ctx))
@@ -2704,7 +2704,7 @@ int ossl_quic_write_flags(SSL *s, const void *buf, size_t len,
 
     if (len == 0) {
         /* Do not autocreate default XSO for zero-length writes. */
-        if (!expect_quic(s, &ctx))
+        if (!expect_quic_cs(s, &ctx))
             return 0;
 
         qctx_lock_for_io(&ctx);