diff options
Diffstat (limited to 'src/lib/libssl/ssl_locl.h')
-rw-r--r-- | src/lib/libssl/ssl_locl.h | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index edb8223fe2..fc61ffee4f 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.320 2021/02/07 15:26:32 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.321 2021/02/20 09:43:29 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 | * |
@@ -520,6 +520,13 @@ typedef struct ssl_ctx_internal_st { | |||
520 | uint16_t min_version; | 520 | uint16_t min_version; |
521 | uint16_t max_version; | 521 | uint16_t max_version; |
522 | 522 | ||
523 | /* | ||
524 | * These may be zero to imply minimum or maximum version supported by | ||
525 | * the method. | ||
526 | */ | ||
527 | uint16_t min_proto_version; | ||
528 | uint16_t max_proto_version; | ||
529 | |||
523 | unsigned long options; | 530 | unsigned long options; |
524 | unsigned long mode; | 531 | unsigned long mode; |
525 | 532 | ||
@@ -682,6 +689,13 @@ typedef struct ssl_internal_st { | |||
682 | uint16_t min_version; | 689 | uint16_t min_version; |
683 | uint16_t max_version; | 690 | uint16_t max_version; |
684 | 691 | ||
692 | /* | ||
693 | * These may be zero to imply minimum or maximum version supported by | ||
694 | * the method. | ||
695 | */ | ||
696 | uint16_t min_proto_version; | ||
697 | uint16_t max_proto_version; | ||
698 | |||
685 | unsigned long options; /* protocol behaviour */ | 699 | unsigned long options; /* protocol behaviour */ |
686 | unsigned long mode; /* API behaviour */ | 700 | unsigned long mode; /* API behaviour */ |
687 | 701 | ||
@@ -1111,9 +1125,9 @@ int ssl_enabled_version_range(SSL *s, uint16_t *min_ver, uint16_t *max_ver); | |||
1111 | int ssl_supported_version_range(SSL *s, uint16_t *min_ver, uint16_t *max_ver); | 1125 | int ssl_supported_version_range(SSL *s, uint16_t *min_ver, uint16_t *max_ver); |
1112 | int ssl_max_shared_version(SSL *s, uint16_t peer_ver, uint16_t *max_ver); | 1126 | int ssl_max_shared_version(SSL *s, uint16_t peer_ver, uint16_t *max_ver); |
1113 | int ssl_version_set_min(const SSL_METHOD *meth, uint16_t ver, uint16_t max_ver, | 1127 | int ssl_version_set_min(const SSL_METHOD *meth, uint16_t ver, uint16_t max_ver, |
1114 | uint16_t *out_ver); | 1128 | uint16_t *out_ver, uint16_t *out_proto_ver); |
1115 | int ssl_version_set_max(const SSL_METHOD *meth, uint16_t ver, uint16_t min_ver, | 1129 | int ssl_version_set_max(const SSL_METHOD *meth, uint16_t ver, uint16_t min_ver, |
1116 | uint16_t *out_ver); | 1130 | uint16_t *out_ver, uint16_t *out_proto_ver); |
1117 | int ssl_downgrade_max_version(SSL *s, uint16_t *max_ver); | 1131 | int ssl_downgrade_max_version(SSL *s, uint16_t *max_ver); |
1118 | int ssl_legacy_stack_version(SSL *s, uint16_t version); | 1132 | int ssl_legacy_stack_version(SSL *s, uint16_t version); |
1119 | int ssl_cipher_in_list(STACK_OF(SSL_CIPHER) *ciphers, const SSL_CIPHER *cipher); | 1133 | int ssl_cipher_in_list(STACK_OF(SSL_CIPHER) *ciphers, const SSL_CIPHER *cipher); |