From: Hugo Landau <hlandau@openssl.org>
Date: Wed, 14 Feb 2024 10:06:45 +0000 (+0000)
Subject: Minor updates
X-Git-Tag: openssl-3.3.0-alpha1~76
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a768a796f26ecebc12ac0bd9b86c5c30bfd9370b;p=thirdparty%2Fopenssl.git

Minor updates

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

diff --git a/doc/man3/SSL_get_value_uint.pod b/doc/man3/SSL_get_value_uint.pod
index 0be08e2e125..2a4e01c7e2e 100644
--- a/doc/man3/SSL_get_value_uint.pod
+++ b/doc/man3/SSL_get_value_uint.pod
@@ -204,17 +204,17 @@ defaults to this setting.
 
 =item B<SSL_VALUE_EVENT_HANDLING_MODE_IMPLICIT> (Implicit event handling)
 
-If set to this value (the default), the implicit event handling model is used.
-Under this model, QUIC objects will automatically perform background event
-processing (equivalent to a call to L<SSL_handle_events(3)>) when calls to I/O
-functions such as L<SSL_read_ex(3)> or L<SSL_write_ex(3)> are made on a QUIC SSL
-object. This helps to maintain the health of the QUIC connection and ensures
-that incoming datagrams and timeout events are processed.
+If set to this value, the implicit event handling model is used. Under this
+model, QUIC objects will automatically perform background event processing
+(equivalent to a call to L<SSL_handle_events(3)>) when calls to I/O functions
+such as L<SSL_read_ex(3)> or L<SSL_write_ex(3)> are made on a QUIC SSL object.
+This helps to maintain the health of the QUIC connection and ensures that
+incoming datagrams and timeout events are processed.
 
 =item B<SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT> (Explicit event handling)
 
-If set to 0, the explicit event handling model is used. Under this model,
-B<nonblocking> calls to I/O functions such as L<SSL_read_ex(3)> or
+If set to this value, the explicit event handling model is used. Under this
+model, B<nonblocking> calls to I/O functions such as L<SSL_read_ex(3)> or
 L<SSL_write_ex(3)> do not result in the automatic processing of QUIC events. Any
 new incoming network traffic is not handled; no new outgoing network traffic is
 generated, and pending timeout events are not processed. This allows an
diff --git a/ssl/quic/quic_impl.c b/ssl/quic/quic_impl.c
index 4f552ca6b2a..31548c1b1d7 100644
--- a/ssl/quic/quic_impl.c
+++ b/ssl/quic/quic_impl.c
@@ -3307,14 +3307,11 @@ static int qctx_should_autotick(QCTX *ctx)
     if (ctx->is_stream) {
         event_handling_mode = ctx->xso->event_handling_mode;
         if (event_handling_mode != SSL_VALUE_EVENT_HANDLING_MODE_INHERIT)
-            return event_handling_mode == SSL_VALUE_EVENT_HANDLING_MODE_IMPLICIT;
+            return event_handling_mode != SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT;
     }
 
     event_handling_mode = ctx->qc->event_handling_mode;
-    if (event_handling_mode == SSL_VALUE_EVENT_HANDLING_MODE_INHERIT)
-        event_handling_mode = SSL_VALUE_EVENT_HANDLING_MODE_IMPLICIT;
-
-    return event_handling_mode == SSL_VALUE_EVENT_HANDLING_MODE_IMPLICIT;
+    return event_handling_mode != SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT;
 }
 
 QUIC_NEEDS_LOCK