From: Matt Caswell <matt@openssl.org>
Date: Tue, 13 Jun 2023 12:11:18 +0000 (+0100)
Subject: Ensure SSL_connect() actually blocks if we are in blocking mode
X-Git-Tag: openssl-3.2.0-alpha1~579
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fb4a2bba7115d1d1d5ac0ab8829e9659199ef77d;p=thirdparty%2Fopenssl.git

Ensure SSL_connect() actually blocks if we are in blocking mode

Fix supplied by Hugo Landau.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21204)
---

diff --git a/ssl/quic/quic_impl.c b/ssl/quic/quic_impl.c
index d2a79feb61b..b1e9be774b2 100644
--- a/ssl/quic/quic_impl.c
+++ b/ssl/quic/quic_impl.c
@@ -339,6 +339,7 @@ SSL *ossl_quic_new(SSL_CTX *ctx)
     qc->default_stream_mode     = SSL_DEFAULT_STREAM_MODE_AUTO_BIDI;
     qc->default_ssl_mode        = qc->ssl.ctx->mode;
     qc->default_blocking        = 1;
+    qc->blocking                = 1;
     qc->incoming_stream_policy  = SSL_INCOMING_STREAM_POLICY_AUTO;
     qc->last_error              = SSL_ERROR_NONE;