diff options
| author | Frederik Wedel-Heinen <frederik.wedel-heinen@dencrypt.dk> | 2023-10-04 10:03:45 +0200 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2024-04-02 13:47:58 +0100 |
| commit | 068cb64b19cc9efceb3a1acffb8f860d49625263 (patch) | |
| tree | 66cc2bc10cd9d60c395ee7ed56cafde774ad141b | |
| parent | 558f7f00851729e0291f6b474beb7f2a39677846 (diff) | |
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)
| -rw-r--r-- | ssl/ssl_conf.c | 3 | ||||
| -rw-r--r-- | ssl/t1_trce.c | 1 | ||||
| -rw-r--r-- | test/helpers/ssl_test_ctx.c | 1 | ||||
| -rw-r--r-- | test/ssl_old_test.c | 3 |
4 files changed, 6 insertions, 2 deletions
diff --git a/ssl/ssl_conf.c b/ssl/ssl_conf.c index e8d319bc52..7d2dd279a2 100644 --- a/ssl/ssl_conf.c +++ b/ssl/ssl_conf.c @@ -318,7 +318,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 29dce65e4f..07032975f2 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 ec2c7885ba..10bbdc4f1b 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 430e1801e7..c6486f18c3 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); |