mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-03-19 19:50:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant logic for DTLS server version selection

Browse Source 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22989)
This commit is contained in:
Frederik Wedel-Heinen 2023-12-12 12:58:01 +01:00 committed by Matt Caswell
parent f4ad7c2f73
commit 78ef740999
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ssl/statem/statem_srvr.c
View File

@ -1734,16 +1734,9 @@ static int tls_early_post_process_client_hello(SSL_CONNECTION *s)
/* SSLv3/TLS */
s->client_version = clienthello->legacy_version;
}
/*
* Do SSL/TLS version negotiation if applicable.
*/
if (SSL_CONNECTION_IS_DTLS(s)
&& ssl->method->version != DTLS_ANY_VERSION
&& DTLS_VERSION_LT((int)clienthello->legacy_version, s->version)) {
protverr = SSL_R_VERSION_TOO_LOW;
} else {
protverr = ssl_choose_server_version(s, clienthello, &dgrd);
}
/* Choose the server SSL/TLS/DTLS version. */
protverr = ssl_choose_server_version(s, clienthello, &dgrd);
if (protverr) {
if (SSL_IS_FIRST_HANDSHAKE(s)) {