diff options
Diffstat (limited to 'src/lib/libssl/ssl_versions.c')
-rw-r--r-- | src/lib/libssl/ssl_versions.c | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/src/lib/libssl/ssl_versions.c b/src/lib/libssl/ssl_versions.c index 03eb41582a..b21fa7198c 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.5 2020/05/31 16:36:35 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_versions.c,v 1.6 2020/05/31 18:03:32 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 | * |
@@ -200,30 +200,6 @@ ssl_max_shared_version(SSL *s, uint16_t peer_ver, uint16_t *max_ver) | |||
200 | return 1; | 200 | return 1; |
201 | } | 201 | } |
202 | 202 | ||
203 | uint16_t | ||
204 | ssl_max_server_version(SSL *s) | ||
205 | { | ||
206 | uint16_t max_version, min_version = 0; | ||
207 | |||
208 | if (SSL_IS_DTLS(s)) | ||
209 | return (DTLS1_VERSION); | ||
210 | |||
211 | if (!ssl_enabled_version_range(s, &min_version, &max_version)) | ||
212 | return 0; | ||
213 | |||
214 | /* | ||
215 | * Limit to the versions supported by this method. The SSL method | ||
216 | * will be changed during version negotiation, as such we want to | ||
217 | * use the SSL method from the context. | ||
218 | */ | ||
219 | if (!ssl_clamp_version_range(&min_version, &max_version, | ||
220 | s->ctx->method->internal->min_version, | ||
221 | s->ctx->method->internal->max_version)) | ||
222 | return 0; | ||
223 | |||
224 | return (max_version); | ||
225 | } | ||
226 | |||
227 | int | 203 | int |
228 | ssl_downgrade_max_version(SSL *s, uint16_t *max_ver) | 204 | ssl_downgrade_max_version(SSL *s, uint16_t *max_ver) |
229 | { | 205 | { |