From: Hugo Landau <hlandau@openssl.org>
Date: Wed, 6 Sep 2023 07:04:17 +0000 (+0100)
Subject: QUIC: Wire SSL_net_(read|write)_desired for TLS/DTLS
X-Git-Tag: openssl-3.2.0-alpha2~53
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3432157ba1e0e29bab8bdd31d7ae728930e57c42;p=thirdparty%2Fopenssl.git

QUIC: Wire SSL_net_(read|write)_desired for TLS/DTLS

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21979)
---

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index fdc8b6b8241..fec9124ce4c 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -7344,11 +7344,11 @@ int SSL_net_read_desired(SSL *s)
 {
 #ifndef OPENSSL_NO_QUIC
     if (!IS_QUIC(s))
-        return 0;
+        return SSL_want_read(s);
 
     return ossl_quic_get_net_read_desired(s);
 #else
-    return 0;
+    return SSL_want_read(s);
 #endif
 }
 
@@ -7356,11 +7356,11 @@ int SSL_net_write_desired(SSL *s)
 {
 #ifndef OPENSSL_NO_QUIC
     if (!IS_QUIC(s))
-        return 0;
+        return SSL_want_write(s);
 
     return ossl_quic_get_net_write_desired(s);
 #else
-    return 0;
+    return SSL_want_write(s);
 #endif
 }