From: Matt Caswell <matt@openssl.org>
Date: Tue, 25 Apr 2023 13:06:54 +0000 (+0100)
Subject: Update the SSL_rstate_string*() return value for QUIC
X-Git-Tag: openssl-3.2.0-alpha1~956
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57582450318e955632d8fb09f42bd90f2ed5d3b4;p=thirdparty%2Fopenssl.git

Update the SSL_rstate_string*() return value for QUIC

We make these APIs work more like the TLS versions do.

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

diff --git a/ssl/quic/quic_tls.c b/ssl/quic/quic_tls.c
index 2dedc760cbb..98bf250f934 100644
--- a/ssl/quic/quic_tls.c
+++ b/ssl/quic/quic_tls.c
@@ -451,9 +451,9 @@ static void quic_get_state(OSSL_RECORD_LAYER *rl, const char **shortstr,
 {
     /*
      * According to the docs, valid read state strings are: "RH"/"read header",
-     * "RB"/"read body", "RD"/"read done" and "unknown"/"unknown". We don't
-     * read records in quite that way, so we report every "normal" state as
-     * "read done". In the event of error then we report "unknown".
+     * "RB"/"read body", and "unknown"/"unknown". We don't read records in quite
+     * that way, so we report every "normal" state as "read header". In the
+     * event of error then we report "unknown".
      */
 
     if (rl->qtls->inerror) {
@@ -463,9 +463,9 @@ static void quic_get_state(OSSL_RECORD_LAYER *rl, const char **shortstr,
             *longstr = "unknown";
     } else {
         if (shortstr != NULL)
-            *shortstr = "RD";
+            *shortstr = "RH";
         if (longstr != NULL)
-            *longstr = "read done";
+            *longstr = "read header";
     }
 }