Skip to content

Commit

Permalink
Adds DTLS1.3 to ssl protocol to text structs
Browse files Browse the repository at this point in the history
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from #22273)
  • Loading branch information
fwh-dc authored and mattcaswell committed Apr 23, 2024
1 parent 65e9308 commit f03867e
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 2 deletions.
3 changes: 2 additions & 1 deletion ssl/ssl_conf.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 1 addition & 0 deletions ssl/t1_trce.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)"}
};

Expand Down
1 change: 1 addition & 0 deletions test/helpers/ssl_test_ctx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion test/ssl_old_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit f03867e

Please sign in to comment.