diff options
Diffstat (limited to 'src/lib/libssl/ssl_versions.c')
-rw-r--r-- | src/lib/libssl/ssl_versions.c | 34 |
1 files changed, 1 insertions, 33 deletions
diff --git a/src/lib/libssl/ssl_versions.c b/src/lib/libssl/ssl_versions.c index 37957fd0ab..45e468f0d8 100644 --- a/src/lib/libssl/ssl_versions.c +++ b/src/lib/libssl/ssl_versions.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_versions.c,v 1.14 2021/03/10 18:27:02 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_versions.c,v 1.15 2021/03/11 17:14:47 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2016, 2017 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2016, 2017 Joel Sing <jsing@openbsd.org> |
4 | * | 4 | * |
@@ -252,38 +252,6 @@ ssl_max_shared_version(SSL *s, uint16_t peer_ver, uint16_t *max_ver) | |||
252 | } | 252 | } |
253 | 253 | ||
254 | int | 254 | int |
255 | ssl_downgrade_max_version(SSL *s, uint16_t *max_ver) | ||
256 | { | ||
257 | uint16_t min_version, max_version; | ||
258 | |||
259 | /* | ||
260 | * The downgrade maximum version is based on the versions that are | ||
261 | * enabled, however we also have to then limit to the versions | ||
262 | * supported by the method. The SSL method will be changed during | ||
263 | * version negotiation and when switching from the new stack to | ||
264 | * the legacy context, as such we want to use the method from the | ||
265 | * context. | ||
266 | */ | ||
267 | |||
268 | if (SSL_is_dtls(s)) { | ||
269 | *max_ver = DTLS1_VERSION; | ||
270 | return 1; | ||
271 | } | ||
272 | |||
273 | if (!ssl_enabled_tls_version_range(s, &min_version, &max_version)) | ||
274 | return 0; | ||
275 | |||
276 | if (!ssl_clamp_tls_version_range(&min_version, &max_version, | ||
277 | s->ctx->method->internal->min_tls_version, | ||
278 | s->ctx->method->internal->max_tls_version)) | ||
279 | return 0; | ||
280 | |||
281 | *max_ver = max_version; | ||
282 | |||
283 | return 1; | ||
284 | } | ||
285 | |||
286 | int | ||
287 | ssl_check_version_from_server(SSL *s, uint16_t server_version) | 255 | ssl_check_version_from_server(SSL *s, uint16_t server_version) |
288 | { | 256 | { |
289 | uint16_t min_version, max_version; | 257 | uint16_t min_version, max_version; |