summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/libssl/ssl.h11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h
index b9f772d484..d8c25cac42 100644
--- a/src/lib/libssl/ssl.h
+++ b/src/lib/libssl/ssl.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl.h,v 1.100 2016/11/04 17:58:19 guenther Exp $ */ 1/* $OpenBSD: ssl.h,v 1.101 2016/12/21 16:51:10 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 *
@@ -397,6 +397,8 @@ struct ssl_cipher_st {
397/* Used to hold functions for SSLv3/TLSv1 functions */ 397/* Used to hold functions for SSLv3/TLSv1 functions */
398struct ssl_method_st { 398struct ssl_method_st {
399 int version; 399 int version;
400 uint16_t min_version;
401 uint16_t max_version;
400 int (*ssl_new)(SSL *s); 402 int (*ssl_new)(SSL *s);
401 void (*ssl_clear)(SSL *s); 403 void (*ssl_clear)(SSL *s);
402 void (*ssl_free)(SSL *s); 404 void (*ssl_free)(SSL *s);
@@ -688,6 +690,9 @@ struct lhash_st_SSL_SESSION {
688struct ssl_ctx_st { 690struct ssl_ctx_st {
689 const SSL_METHOD *method; 691 const SSL_METHOD *method;
690 692
693 uint16_t min_version;
694 uint16_t max_version;
695
691 STACK_OF(SSL_CIPHER) *cipher_list; 696 STACK_OF(SSL_CIPHER) *cipher_list;
692 /* same as above but sorted for lookup */ 697 /* same as above but sorted for lookup */
693 STACK_OF(SSL_CIPHER) *cipher_list_by_id; 698 STACK_OF(SSL_CIPHER) *cipher_list_by_id;
@@ -998,6 +1003,10 @@ struct ssl_st {
998 * (one of SSL2_VERSION, SSL3_VERSION, TLS1_VERSION, DTLS1_VERSION) 1003 * (one of SSL2_VERSION, SSL3_VERSION, TLS1_VERSION, DTLS1_VERSION)
999 */ 1004 */
1000 int version; 1005 int version;
1006
1007 uint16_t min_version;
1008 uint16_t max_version;
1009
1001 int type; /* SSL_ST_CONNECT or SSL_ST_ACCEPT */ 1010 int type; /* SSL_ST_CONNECT or SSL_ST_ACCEPT */
1002 1011
1003 const SSL_METHOD *method; /* SSLv3 */ 1012 const SSL_METHOD *method; /* SSLv3 */