From: Frederik Wedel-Heinen <frederik.wedel-heinen@dencrypt.dk>
Date: Wed, 4 Oct 2023 08:03:45 +0000 (+0200)
Subject: Adds DTLS1.3 to ssl protocol to text structs
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=719bf8d2eb0c06a39339fd1749baaae876edc766;p=thirdparty%2Fopenssl.git

Adds DTLS1.3 to ssl protocol to text structs

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

diff --git a/ssl/ssl_conf.c b/ssl/ssl_conf.c
index e22511b634b..ab3ad6ee8a0 100644
--- a/ssl/ssl_conf.c
+++ b/ssl/ssl_conf.c
@@ -320,7 +320,8 @@ static int protocol_from_string(const char *value)
         {"TLSv1.2", TLS1_2_VERSION},
         {"TLSv1.3", TLS1_3_VERSION},
         {"DTLSv1", DTLS1_VERSION},
-        {"DTLSv1.2", DTLS1_2_VERSION}
+        {"DTLSv1.2", DTLS1_2_VERSION},
+        {"DTLSv1.3", DTLS1_3_VERSION}
     };
     size_t i;
     size_t n = OSSL_NELEM(versions);
diff --git a/ssl/t1_trce.c b/ssl/t1_trce.c
index 2d95f3ad3bf..45d5fb0d278 100644
--- a/ssl/t1_trce.c
+++ b/ssl/t1_trce.c
@@ -68,6 +68,7 @@ static const ssl_trace_tbl ssl_version_tbl[] = {
     {TLS1_3_VERSION, "TLS 1.3"},
     {DTLS1_VERSION, "DTLS 1.0"},
     {DTLS1_2_VERSION, "DTLS 1.2"},
+    {DTLS1_3_VERSION, "DTLS 1.3"},
     {DTLS1_BAD_VER, "DTLS 1.0 (bad)"}
 };
 
diff --git a/test/helpers/ssl_test_ctx.c b/test/helpers/ssl_test_ctx.c
index ec2c7885ba7..10bbdc4f1b2 100644
--- a/test/helpers/ssl_test_ctx.c
+++ b/test/helpers/ssl_test_ctx.c
@@ -156,6 +156,7 @@ static const test_enum ssl_protocols[] = {
      {"SSLv3", SSL3_VERSION},
      {"DTLSv1", DTLS1_VERSION},
      {"DTLSv1.2", DTLS1_2_VERSION},
+     {"DTLSv1.3", DTLS1_3_VERSION},
 };
 
 __owur static int parse_protocol(SSL_TEST_CTX *test_ctx, const char *value)
diff --git a/test/ssl_old_test.c b/test/ssl_old_test.c
index 8c26f3ed2f0..3c758472bff 100644
--- a/test/ssl_old_test.c
+++ b/test/ssl_old_test.c
@@ -826,7 +826,8 @@ static int protocol_from_string(const char *value)
         {"tls1.2", TLS1_2_VERSION},
         {"tls1.3", TLS1_3_VERSION},
         {"dtls1", DTLS1_VERSION},
-        {"dtls1.2", DTLS1_2_VERSION}};
+        {"dtls1.2", DTLS1_2_VERSION},
+        {"dtls1.3", DTLS1_3_VERSION}};
     size_t i;
     size_t n = OSSL_NELEM(versions);