summaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2023-06-13 13:11:18 +0100
committerPauli <pauli@openssl.org>2023-06-28 09:53:22 +1000
commitfb4a2bba7115d1d1d5ac0ab8829e9659199ef77d (patch)
treeaf939a3898fcc44c5e009ec6a273749618957a01 /ssl
parentb49d9de0e66a5fe7570652186e3bb8c4a4d9f556 (diff)
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)
Diffstat (limited to 'ssl')
-rw-r--r--ssl/quic/quic_impl.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ssl/quic/quic_impl.c b/ssl/quic/quic_impl.c
index d2a79feb61..b1e9be774b 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;