summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHugo Landau <hlandau@openssl.org>2024-04-04 12:12:45 +0100
committerHugo Landau <hlandau@openssl.org>2024-04-19 09:33:53 +0100
commitc8cd1de701ab448e42ec7c6dd417ef28e5604942 (patch)
treed8162317d6d3cdabb50f00c1d7b55e2e3a18789b
parentea5801df6ab3829afa62c1621ba8b6be60e899e1 (diff)
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)
-rw-r--r--ssl/quic/quic_impl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ssl/quic/quic_impl.c b/ssl/quic/quic_impl.c
index d8fc0c429f..6725f282c2 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))
@@ -2689,7 +2689,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);