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 0d61bc949d6ae7f28a34bd455875c472472dc0ea..65a8fcd9b3d00e9046cebbecf195ef70e3fdf047 100644 (file)
--- 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);