Keep doing ossl_quic_tls_tick() even after handshake completion

There may be post-handshake messages to process so make sure we keep
ticking things even if the handshake has finished. We do this simply by
calling SSL_read(). There should never be app data to read but we will
process any handshake records we encounter.

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

diff --git a/ssl/quic/quic_tls.c b/ssl/quic/quic_tls.c
index 98bf250f9342dfcc2a62fe7a5bb3a33ae7df7a22..5a0b320b5c1a5618d89a97892a24e9dd775ecec2 100644 (file)
--- a/ssl/quic/quic_tls.c
+++ b/ssl/quic/quic_tls.c
@@ -644,9 +644,6 @@ int ossl_quic_tls_tick(QUIC_TLS *qtls)
     if (qtls->inerror)
         return 0;
 
-    if (qtls->complete)
-        return 1;
-
     if (!qtls->configured) {
         SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(qtls->args.s);
         SSL_CTX *sctx = SSL_CONNECTION_GET_CTX(sc);
@@ -702,19 +699,22 @@ int ossl_quic_tls_tick(QUIC_TLS *qtls)
          */
         SSL_set_bio(qtls->args.s, nullbio, nullbio);
 
-        if (qtls->args.is_server) {
+        if (qtls->args.is_server)
             SSL_set_accept_state(qtls->args.s);
-            if (!SSL_set_num_tickets(qtls->args.s, 0)) {
-                qtls->inerror = 1;
-                return 0;
-            }
-        } else {
+        else
             SSL_set_connect_state(qtls->args.s);
-        }
 
         qtls->configured = 1;
     }
-    ret = SSL_do_handshake(qtls->args.s);
+
+    if (qtls->complete)
+        /*
+         * There should never be app data to read, but calling SSL_read() will
+         * ensure any post-handshake messages are processed.
+         */
+        ret = SSL_read(qtls->args.s, NULL, 0);
+    else
+        ret = SSL_do_handshake(qtls->args.s);
     if (ret <= 0) {
         switch (SSL_get_error(qtls->args.s, ret)) {
         case SSL_ERROR_WANT_READ:
@@ -726,14 +726,18 @@ int ossl_quic_tls_tick(QUIC_TLS *qtls)
         }
     }
 
-    /* Validate that we have ALPN */
-    SSL_get0_alpn_selected(qtls->args.s, &alpn, &alpnlen);
-    if (alpn == NULL || alpnlen == 0) {
-        qtls->inerror = 1;
-        return 0;
+    if (!qtls->complete) {
+        /* Validate that we have ALPN */
+        SSL_get0_alpn_selected(qtls->args.s, &alpn, &alpnlen);
+        if (alpn == NULL || alpnlen == 0) {
+            qtls->inerror = 1;
+            return 0;
+        }
+        qtls->complete = 1;
+        return qtls->args.handshake_complete_cb(qtls->args.handshake_complete_cb_arg);
     }
-    qtls->complete = 1;
-    return qtls->args.handshake_complete_cb(qtls->args.handshake_complete_cb_arg);
+
+    return 1;
 }
 
 int ossl_quic_tls_set_transport_params(QUIC_TLS *qtls,