openssl
/
openssl
mirror of https://github.com/openssl/openssl
1
0
Fork 0
Code Issues Releases Wiki Activity

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)
This commit is contained in:
Frederik Wedel-Heinen 2023-10-04 10:03:45 +02:00 committed by Matt Caswell
parent 65e93084a6
commit f03867e41c
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ssl/ssl_conf.c
View File

@ -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);

1
ssl/t1_trce.c
View File

@ -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)"}
};

1
test/helpers/ssl_test_ctx.c
View File

@ -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)

3
test/ssl_old_test.c
View File

@ -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);