From 4663cdfea38094f4ebf916ca5a6ba7945eca0858 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <404610+tatsuhiro-t@users.noreply.github.com>
Date: Fri, 12 Mar 2021 09:55:26 +0900
Subject: QUIC: Process multiple post-handshake messages in a single call (#14)

---
 ssl/ssl_quic.c    | 25 ++++++++++++-------------
 test/sslapitest.c |  6 ++----
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/ssl/ssl_quic.c b/ssl/ssl_quic.c
index 0cbb43af39..c5f20c20af 100644
--- a/ssl/ssl_quic.c
+++ b/ssl/ssl_quic.c
@@ -341,20 +341,19 @@ int SSL_process_quic_post_handshake(SSL *ssl)
     }
 
     /* if there is no data, return success as BoringSSL */
-    if (ssl->quic_input_data_head == NULL)
-        return 1;
-    
-    /*
-     * This is always safe (we are sure to be at a record boundary) because
-     * SSL_read()/SSL_write() are never used for QUIC connections -- the
-     * application data is handled at the QUIC layer instead.
-     */
-    ossl_statem_set_in_init(ssl, 1);
-    ret = ssl->handshake_func(ssl);
-    ossl_statem_set_in_init(ssl, 0);
+    while (ssl->quic_input_data_head != NULL) {
+        /*
+         * This is always safe (we are sure to be at a record boundary) because
+         * SSL_read()/SSL_write() are never used for QUIC connections -- the
+         * application data is handled at the QUIC layer instead.
+         */
+        ossl_statem_set_in_init(ssl, 1);
+        ret = ssl->handshake_func(ssl);
+        ossl_statem_set_in_init(ssl, 0);
 
-    if (ret <= 0)
-        return 0;
+        if (ret <= 0)
+            return 0;
+    }
     return 1;
 }
 
diff --git a/test/sslapitest.c b/test/sslapitest.c
index 1beaeb699c..00ec738956 100644
--- a/test/sslapitest.c
+++ b/test/sslapitest.c
@@ -7391,8 +7391,7 @@ static int test_quic_api_version(int clnt, int srvr)
         goto end;
 
     /* Deal with two NewSessionTickets */
-    if (!TEST_true(SSL_process_quic_post_handshake(clientssl))
-            || !TEST_true(SSL_process_quic_post_handshake(clientssl)))
+    if (!TEST_true(SSL_process_quic_post_handshake(clientssl)))
         goto end;
 
     /* Dummy handshake call should succeed */
@@ -7583,8 +7582,7 @@ static int quic_setupearly_data_test(SSL_CTX **cctx, SSL_CTX **sctx,
         return 0;
 
     /* Deal with two NewSessionTickets */
-    if (!TEST_true(SSL_process_quic_post_handshake(*clientssl))
-            || !TEST_true(SSL_process_quic_post_handshake(*clientssl)))
+    if (!TEST_true(SSL_process_quic_post_handshake(*clientssl)))
         return 0;
 
     *sess = SSL_get1_session(*clientssl);
-- 
2.35.3