diff options
author | jsing <> | 2017-01-03 16:57:15 +0000 |
---|---|---|
committer | jsing <> | 2017-01-03 16:57:15 +0000 |
commit | 5bf1d8eae1dc8ce16782f7063874adf628e6d7c8 (patch) | |
tree | 578935c9d2b0a3d0cd5d0f160e725d3c62e7a3f7 /src/lib/libssl/ssl_locl.h | |
parent | c20fa45999bc9c9e18b6372552c975600aa2aae2 (diff) | |
download | openbsd-5bf1d8eae1dc8ce16782f7063874adf628e6d7c8.tar.gz openbsd-5bf1d8eae1dc8ce16782f7063874adf628e6d7c8.tar.bz2 openbsd-5bf1d8eae1dc8ce16782f7063874adf628e6d7c8.zip |
Pull out, rework and dedup the code that determines the highest shared
version.
ok beck@ doug@
Diffstat (limited to 'src/lib/libssl/ssl_locl.h')
-rw-r--r-- | src/lib/libssl/ssl_locl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index e8fbd23572..800c56e31b 100644 --- a/src/lib/libssl/ssl_locl.h +++ b/src/lib/libssl/ssl_locl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_locl.h,v 1.143 2016/12/30 16:57:01 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.144 2017/01/03 16:57:15 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -498,6 +498,7 @@ extern SSL_CIPHER ssl3_ciphers[]; | |||
498 | 498 | ||
499 | const char *ssl_version_string(int ver); | 499 | const char *ssl_version_string(int ver); |
500 | int ssl_enabled_version_range(SSL *s, uint16_t *min_ver, uint16_t *max_ver); | 500 | int ssl_enabled_version_range(SSL *s, uint16_t *min_ver, uint16_t *max_ver); |
501 | int ssl_max_shared_version(SSL *s, uint16_t peer_ver, uint16_t *max_ver); | ||
501 | uint16_t ssl_max_server_version(SSL *s); | 502 | uint16_t ssl_max_server_version(SSL *s); |
502 | 503 | ||
503 | extern SSL3_ENC_METHOD DTLSv1_enc_data; | 504 | extern SSL3_ENC_METHOD DTLSv1_enc_data; |