diff options
Diffstat (limited to 'src/lib/libssl/ssl_versions.c')
| -rw-r--r-- | src/lib/libssl/ssl_versions.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/lib/libssl/ssl_versions.c b/src/lib/libssl/ssl_versions.c index 8273546062..edd077b166 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.27 2023/07/02 17:21:32 beck Exp $ */ | 1 | /* $OpenBSD: ssl_versions.c,v 1.28 2026/06/04 12:05:57 tb 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 | * |
| @@ -125,7 +125,7 @@ ssl_version_set_max(const SSL_METHOD *meth, uint16_t proto_ver, | |||
| 125 | } | 125 | } |
| 126 | 126 | ||
| 127 | int | 127 | int |
| 128 | ssl_enabled_tls_version_range(SSL *s, uint16_t *min_ver, uint16_t *max_ver) | 128 | ssl_enabled_tls_version_range(const SSL *s, uint16_t *min_ver, uint16_t *max_ver) |
| 129 | { | 129 | { |
| 130 | uint16_t min_version, max_version; | 130 | uint16_t min_version, max_version; |
| 131 | unsigned long options; | 131 | unsigned long options; |
| @@ -186,7 +186,8 @@ ssl_enabled_tls_version_range(SSL *s, uint16_t *min_ver, uint16_t *max_ver) | |||
| 186 | } | 186 | } |
| 187 | 187 | ||
| 188 | int | 188 | int |
| 189 | ssl_supported_tls_version_range(SSL *s, uint16_t *min_ver, uint16_t *max_ver) | 189 | ssl_supported_tls_version_range(const SSL *s, uint16_t *min_ver, |
| 190 | uint16_t *max_ver) | ||
| 190 | { | 191 | { |
| 191 | uint16_t min_version, max_version; | 192 | uint16_t min_version, max_version; |
| 192 | 193 | ||
| @@ -222,7 +223,7 @@ ssl_tls_version(uint16_t version) | |||
| 222 | } | 223 | } |
| 223 | 224 | ||
| 224 | uint16_t | 225 | uint16_t |
| 225 | ssl_effective_tls_version(SSL *s) | 226 | ssl_effective_tls_version(const SSL *s) |
| 226 | { | 227 | { |
| 227 | if (s->s3->hs.negotiated_tls_version > 0) | 228 | if (s->s3->hs.negotiated_tls_version > 0) |
| 228 | return s->s3->hs.negotiated_tls_version; | 229 | return s->s3->hs.negotiated_tls_version; |
| @@ -231,7 +232,7 @@ ssl_effective_tls_version(SSL *s) | |||
| 231 | } | 232 | } |
| 232 | 233 | ||
| 233 | int | 234 | int |
| 234 | ssl_max_supported_version(SSL *s, uint16_t *max_ver) | 235 | ssl_max_supported_version(const SSL *s, uint16_t *max_ver) |
| 235 | { | 236 | { |
| 236 | uint16_t max_version; | 237 | uint16_t max_version; |
| 237 | 238 | ||
| @@ -251,7 +252,7 @@ ssl_max_supported_version(SSL *s, uint16_t *max_ver) | |||
| 251 | } | 252 | } |
| 252 | 253 | ||
| 253 | int | 254 | int |
| 254 | ssl_max_legacy_version(SSL *s, uint16_t *max_ver) | 255 | ssl_max_legacy_version(const SSL *s, uint16_t *max_ver) |
| 255 | { | 256 | { |
| 256 | uint16_t max_version; | 257 | uint16_t max_version; |
| 257 | 258 | ||
| @@ -269,7 +270,7 @@ ssl_max_legacy_version(SSL *s, uint16_t *max_ver) | |||
| 269 | } | 270 | } |
| 270 | 271 | ||
| 271 | int | 272 | int |
| 272 | ssl_max_shared_version(SSL *s, uint16_t peer_ver, uint16_t *max_ver) | 273 | ssl_max_shared_version(const SSL *s, uint16_t peer_ver, uint16_t *max_ver) |
| 273 | { | 274 | { |
| 274 | uint16_t min_version, max_version, peer_tls_version, shared_version; | 275 | uint16_t min_version, max_version, peer_tls_version, shared_version; |
| 275 | 276 | ||
| @@ -338,7 +339,7 @@ ssl_max_shared_version(SSL *s, uint16_t peer_ver, uint16_t *max_ver) | |||
| 338 | } | 339 | } |
| 339 | 340 | ||
| 340 | int | 341 | int |
| 341 | ssl_check_version_from_server(SSL *s, uint16_t server_version) | 342 | ssl_check_version_from_server(const SSL *s, uint16_t server_version) |
| 342 | { | 343 | { |
| 343 | uint16_t min_tls_version, max_tls_version, server_tls_version; | 344 | uint16_t min_tls_version, max_tls_version, server_tls_version; |
| 344 | 345 | ||
| @@ -363,7 +364,7 @@ ssl_check_version_from_server(SSL *s, uint16_t server_version) | |||
| 363 | } | 364 | } |
| 364 | 365 | ||
| 365 | int | 366 | int |
| 366 | ssl_legacy_stack_version(SSL *s, uint16_t version) | 367 | ssl_legacy_stack_version(const SSL *s, uint16_t version) |
| 367 | { | 368 | { |
| 368 | if (SSL_is_dtls(s)) | 369 | if (SSL_is_dtls(s)) |
| 369 | return version == DTLS1_VERSION || version == DTLS1_2_VERSION; | 370 | return version == DTLS1_VERSION || version == DTLS1_2_VERSION; |
