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 3d835ab33c92f1ad8b4145538b5dd06c6c1a2c04..2ee4d95895cf06311aab0c05e266b82e23f64281 100644 (file)
--- a/ssl/ssl_conf.c
+++ b/ssl/ssl_conf.c
@@ -323,7 +323,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 640552c0ba0dbc372c2d8be26586eb8405db39de..41d2f0e591e311e42df4b99f8a554696e50ac05a 100644 (file)
--- a/ssl/t1_trce.c
+++ b/ssl/t1_trce.c
@@ -70,6 +70,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 cbd6481e72e4f330ab9332ffb295ff9154bd145c..9d6e887285b4c83880b44da7de093e516118acd2 100644 (file)
--- a/test/helpers/ssl_test_ctx.c
+++ b/test/helpers/ssl_test_ctx.c
@@ -161,6 +161,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 b404efa2de2cfad593370ed46f7d28ec41d7c9bf..e2a9e9a40101a9a57b00977e6f04d8a5ae067428 100644 (file)
--- 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);