diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libssl/d1_clnt.c | 4 | ||||
| -rw-r--r-- | src/lib/libssl/d1_meth.c | 4 | ||||
| -rw-r--r-- | src/lib/libssl/d1_srvr.c | 4 | ||||
| -rw-r--r-- | src/lib/libssl/t1_clnt.c | 10 | ||||
| -rw-r--r-- | src/lib/libssl/t1_meth.c | 10 | ||||
| -rw-r--r-- | src/lib/libssl/t1_srvr.c | 10 |
6 files changed, 36 insertions, 6 deletions
diff --git a/src/lib/libssl/d1_clnt.c b/src/lib/libssl/d1_clnt.c index 42e149f864..633eabf8b4 100644 --- a/src/lib/libssl/d1_clnt.c +++ b/src/lib/libssl/d1_clnt.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: d1_clnt.c,v 1.59 2016/12/06 13:38:11 jsing Exp $ */ | 1 | /* $OpenBSD: d1_clnt.c,v 1.60 2017/01/21 06:50:02 jsing Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * DTLS implementation written by Nagendra Modadugu | 3 | * DTLS implementation written by Nagendra Modadugu |
| 4 | * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. | 4 | * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. |
| @@ -132,6 +132,8 @@ static int dtls1_get_hello_verify(SSL *s); | |||
| 132 | 132 | ||
| 133 | static const SSL_METHOD DTLSv1_client_method_data = { | 133 | static const SSL_METHOD DTLSv1_client_method_data = { |
| 134 | .version = DTLS1_VERSION, | 134 | .version = DTLS1_VERSION, |
| 135 | .min_version = DTLS1_VERSION, | ||
| 136 | .max_version = DTLS1_VERSION, | ||
| 135 | .ssl_new = dtls1_new, | 137 | .ssl_new = dtls1_new, |
| 136 | .ssl_clear = dtls1_clear, | 138 | .ssl_clear = dtls1_clear, |
| 137 | .ssl_free = dtls1_free, | 139 | .ssl_free = dtls1_free, |
diff --git a/src/lib/libssl/d1_meth.c b/src/lib/libssl/d1_meth.c index 83917e336d..c7604863fa 100644 --- a/src/lib/libssl/d1_meth.c +++ b/src/lib/libssl/d1_meth.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: d1_meth.c,v 1.10 2016/11/04 18:30:21 guenther Exp $ */ | 1 | /* $OpenBSD: d1_meth.c,v 1.11 2017/01/21 06:50:02 jsing Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * DTLS implementation written by Nagendra Modadugu | 3 | * DTLS implementation written by Nagendra Modadugu |
| 4 | * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. | 4 | * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. |
| @@ -67,6 +67,8 @@ static const SSL_METHOD *dtls1_get_method(int ver); | |||
| 67 | 67 | ||
| 68 | static const SSL_METHOD DTLSv1_method_data = { | 68 | static const SSL_METHOD DTLSv1_method_data = { |
| 69 | .version = DTLS1_VERSION, | 69 | .version = DTLS1_VERSION, |
| 70 | .min_version = DTLS1_VERSION, | ||
| 71 | .max_version = DTLS1_VERSION, | ||
| 70 | .ssl_new = dtls1_new, | 72 | .ssl_new = dtls1_new, |
| 71 | .ssl_clear = dtls1_clear, | 73 | .ssl_clear = dtls1_clear, |
| 72 | .ssl_free = dtls1_free, | 74 | .ssl_free = dtls1_free, |
diff --git a/src/lib/libssl/d1_srvr.c b/src/lib/libssl/d1_srvr.c index 472d0de9dd..4322a219f5 100644 --- a/src/lib/libssl/d1_srvr.c +++ b/src/lib/libssl/d1_srvr.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: d1_srvr.c,v 1.69 2016/12/06 13:38:11 jsing Exp $ */ | 1 | /* $OpenBSD: d1_srvr.c,v 1.70 2017/01/21 06:50:02 jsing Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * DTLS implementation written by Nagendra Modadugu | 3 | * DTLS implementation written by Nagendra Modadugu |
| 4 | * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. | 4 | * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. |
| @@ -130,6 +130,8 @@ static int dtls1_send_hello_verify_request(SSL *s); | |||
| 130 | 130 | ||
| 131 | static const SSL_METHOD DTLSv1_server_method_data = { | 131 | static const SSL_METHOD DTLSv1_server_method_data = { |
| 132 | .version = DTLS1_VERSION, | 132 | .version = DTLS1_VERSION, |
| 133 | .min_version = DTLS1_VERSION, | ||
| 134 | .max_version = DTLS1_VERSION, | ||
| 133 | .ssl_new = dtls1_new, | 135 | .ssl_new = dtls1_new, |
| 134 | .ssl_clear = dtls1_clear, | 136 | .ssl_clear = dtls1_clear, |
| 135 | .ssl_free = dtls1_free, | 137 | .ssl_free = dtls1_free, |
diff --git a/src/lib/libssl/t1_clnt.c b/src/lib/libssl/t1_clnt.c index 9107f3976e..d643d5db13 100644 --- a/src/lib/libssl/t1_clnt.c +++ b/src/lib/libssl/t1_clnt.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: t1_clnt.c,v 1.19 2016/11/04 18:30:21 guenther Exp $ */ | 1 | /* $OpenBSD: t1_clnt.c,v 1.20 2017/01/21 06:50:02 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 | * |
| @@ -68,6 +68,8 @@ static const SSL_METHOD *tls1_get_client_method(int ver); | |||
| 68 | 68 | ||
| 69 | static const SSL_METHOD TLS_client_method_data = { | 69 | static const SSL_METHOD TLS_client_method_data = { |
| 70 | .version = TLS1_2_VERSION, | 70 | .version = TLS1_2_VERSION, |
| 71 | .min_version = TLS1_VERSION, | ||
| 72 | .max_version = TLS1_2_VERSION, | ||
| 71 | .ssl_new = tls1_new, | 73 | .ssl_new = tls1_new, |
| 72 | .ssl_clear = tls1_clear, | 74 | .ssl_clear = tls1_clear, |
| 73 | .ssl_free = tls1_free, | 75 | .ssl_free = tls1_free, |
| @@ -100,6 +102,8 @@ static const SSL_METHOD TLS_client_method_data = { | |||
| 100 | 102 | ||
| 101 | static const SSL_METHOD TLSv1_client_method_data = { | 103 | static const SSL_METHOD TLSv1_client_method_data = { |
| 102 | .version = TLS1_VERSION, | 104 | .version = TLS1_VERSION, |
| 105 | .min_version = TLS1_VERSION, | ||
| 106 | .max_version = TLS1_VERSION, | ||
| 103 | .ssl_new = tls1_new, | 107 | .ssl_new = tls1_new, |
| 104 | .ssl_clear = tls1_clear, | 108 | .ssl_clear = tls1_clear, |
| 105 | .ssl_free = tls1_free, | 109 | .ssl_free = tls1_free, |
| @@ -132,6 +136,8 @@ static const SSL_METHOD TLSv1_client_method_data = { | |||
| 132 | 136 | ||
| 133 | static const SSL_METHOD TLSv1_1_client_method_data = { | 137 | static const SSL_METHOD TLSv1_1_client_method_data = { |
| 134 | .version = TLS1_1_VERSION, | 138 | .version = TLS1_1_VERSION, |
| 139 | .min_version = TLS1_1_VERSION, | ||
| 140 | .max_version = TLS1_1_VERSION, | ||
| 135 | .ssl_new = tls1_new, | 141 | .ssl_new = tls1_new, |
| 136 | .ssl_clear = tls1_clear, | 142 | .ssl_clear = tls1_clear, |
| 137 | .ssl_free = tls1_free, | 143 | .ssl_free = tls1_free, |
| @@ -164,6 +170,8 @@ static const SSL_METHOD TLSv1_1_client_method_data = { | |||
| 164 | 170 | ||
| 165 | static const SSL_METHOD TLSv1_2_client_method_data = { | 171 | static const SSL_METHOD TLSv1_2_client_method_data = { |
| 166 | .version = TLS1_2_VERSION, | 172 | .version = TLS1_2_VERSION, |
| 173 | .min_version = TLS1_2_VERSION, | ||
| 174 | .max_version = TLS1_2_VERSION, | ||
| 167 | .ssl_new = tls1_new, | 175 | .ssl_new = tls1_new, |
| 168 | .ssl_clear = tls1_clear, | 176 | .ssl_clear = tls1_clear, |
| 169 | .ssl_free = tls1_free, | 177 | .ssl_free = tls1_free, |
diff --git a/src/lib/libssl/t1_meth.c b/src/lib/libssl/t1_meth.c index 261ab192be..5c37142ab3 100644 --- a/src/lib/libssl/t1_meth.c +++ b/src/lib/libssl/t1_meth.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: t1_meth.c,v 1.18 2016/11/04 18:30:21 guenther Exp $ */ | 1 | /* $OpenBSD: t1_meth.c,v 1.19 2017/01/21 06:50:02 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 | * |
| @@ -66,6 +66,8 @@ static const SSL_METHOD *tls1_get_method(int ver); | |||
| 66 | 66 | ||
| 67 | static const SSL_METHOD TLS_method_data = { | 67 | static const SSL_METHOD TLS_method_data = { |
| 68 | .version = TLS1_2_VERSION, | 68 | .version = TLS1_2_VERSION, |
| 69 | .min_version = TLS1_VERSION, | ||
| 70 | .max_version = TLS1_2_VERSION, | ||
| 69 | .ssl_new = tls1_new, | 71 | .ssl_new = tls1_new, |
| 70 | .ssl_clear = tls1_clear, | 72 | .ssl_clear = tls1_clear, |
| 71 | .ssl_free = tls1_free, | 73 | .ssl_free = tls1_free, |
| @@ -98,6 +100,8 @@ static const SSL_METHOD TLS_method_data = { | |||
| 98 | 100 | ||
| 99 | static const SSL_METHOD TLSv1_method_data = { | 101 | static const SSL_METHOD TLSv1_method_data = { |
| 100 | .version = TLS1_VERSION, | 102 | .version = TLS1_VERSION, |
| 103 | .min_version = TLS1_VERSION, | ||
| 104 | .max_version = TLS1_VERSION, | ||
| 101 | .ssl_new = tls1_new, | 105 | .ssl_new = tls1_new, |
| 102 | .ssl_clear = tls1_clear, | 106 | .ssl_clear = tls1_clear, |
| 103 | .ssl_free = tls1_free, | 107 | .ssl_free = tls1_free, |
| @@ -130,6 +134,8 @@ static const SSL_METHOD TLSv1_method_data = { | |||
| 130 | 134 | ||
| 131 | static const SSL_METHOD TLSv1_1_method_data = { | 135 | static const SSL_METHOD TLSv1_1_method_data = { |
| 132 | .version = TLS1_1_VERSION, | 136 | .version = TLS1_1_VERSION, |
| 137 | .min_version = TLS1_1_VERSION, | ||
| 138 | .max_version = TLS1_1_VERSION, | ||
| 133 | .ssl_new = tls1_new, | 139 | .ssl_new = tls1_new, |
| 134 | .ssl_clear = tls1_clear, | 140 | .ssl_clear = tls1_clear, |
| 135 | .ssl_free = tls1_free, | 141 | .ssl_free = tls1_free, |
| @@ -162,6 +168,8 @@ static const SSL_METHOD TLSv1_1_method_data = { | |||
| 162 | 168 | ||
| 163 | static const SSL_METHOD TLSv1_2_method_data = { | 169 | static const SSL_METHOD TLSv1_2_method_data = { |
| 164 | .version = TLS1_2_VERSION, | 170 | .version = TLS1_2_VERSION, |
| 171 | .min_version = TLS1_2_VERSION, | ||
| 172 | .max_version = TLS1_2_VERSION, | ||
| 165 | .ssl_new = tls1_new, | 173 | .ssl_new = tls1_new, |
| 166 | .ssl_clear = tls1_clear, | 174 | .ssl_clear = tls1_clear, |
| 167 | .ssl_free = tls1_free, | 175 | .ssl_free = tls1_free, |
diff --git a/src/lib/libssl/t1_srvr.c b/src/lib/libssl/t1_srvr.c index 74c73a4337..84ed66c7ed 100644 --- a/src/lib/libssl/t1_srvr.c +++ b/src/lib/libssl/t1_srvr.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: t1_srvr.c,v 1.20 2016/11/04 18:30:21 guenther Exp $ */ | 1 | /* $OpenBSD: t1_srvr.c,v 1.21 2017/01/21 06:50:02 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 | * |
| @@ -69,6 +69,8 @@ static const SSL_METHOD *tls1_get_server_method(int ver); | |||
| 69 | 69 | ||
| 70 | static const SSL_METHOD TLS_server_method_data = { | 70 | static const SSL_METHOD TLS_server_method_data = { |
| 71 | .version = TLS1_2_VERSION, | 71 | .version = TLS1_2_VERSION, |
| 72 | .min_version = TLS1_VERSION, | ||
| 73 | .max_version = TLS1_2_VERSION, | ||
| 72 | .ssl_new = tls1_new, | 74 | .ssl_new = tls1_new, |
| 73 | .ssl_clear = tls1_clear, | 75 | .ssl_clear = tls1_clear, |
| 74 | .ssl_free = tls1_free, | 76 | .ssl_free = tls1_free, |
| @@ -101,6 +103,8 @@ static const SSL_METHOD TLS_server_method_data = { | |||
| 101 | 103 | ||
| 102 | static const SSL_METHOD TLSv1_server_method_data = { | 104 | static const SSL_METHOD TLSv1_server_method_data = { |
| 103 | .version = TLS1_VERSION, | 105 | .version = TLS1_VERSION, |
| 106 | .min_version = TLS1_VERSION, | ||
| 107 | .max_version = TLS1_VERSION, | ||
| 104 | .ssl_new = tls1_new, | 108 | .ssl_new = tls1_new, |
| 105 | .ssl_clear = tls1_clear, | 109 | .ssl_clear = tls1_clear, |
| 106 | .ssl_free = tls1_free, | 110 | .ssl_free = tls1_free, |
| @@ -133,6 +137,8 @@ static const SSL_METHOD TLSv1_server_method_data = { | |||
| 133 | 137 | ||
| 134 | static const SSL_METHOD TLSv1_1_server_method_data = { | 138 | static const SSL_METHOD TLSv1_1_server_method_data = { |
| 135 | .version = TLS1_1_VERSION, | 139 | .version = TLS1_1_VERSION, |
| 140 | .min_version = TLS1_1_VERSION, | ||
| 141 | .max_version = TLS1_1_VERSION, | ||
| 136 | .ssl_new = tls1_new, | 142 | .ssl_new = tls1_new, |
| 137 | .ssl_clear = tls1_clear, | 143 | .ssl_clear = tls1_clear, |
| 138 | .ssl_free = tls1_free, | 144 | .ssl_free = tls1_free, |
| @@ -165,6 +171,8 @@ static const SSL_METHOD TLSv1_1_server_method_data = { | |||
| 165 | 171 | ||
| 166 | static const SSL_METHOD TLSv1_2_server_method_data = { | 172 | static const SSL_METHOD TLSv1_2_server_method_data = { |
| 167 | .version = TLS1_2_VERSION, | 173 | .version = TLS1_2_VERSION, |
| 174 | .min_version = TLS1_2_VERSION, | ||
| 175 | .max_version = TLS1_2_VERSION, | ||
| 168 | .ssl_new = tls1_new, | 176 | .ssl_new = tls1_new, |
| 169 | .ssl_clear = tls1_clear, | 177 | .ssl_clear = tls1_clear, |
| 170 | .ssl_free = tls1_free, | 178 | .ssl_free = tls1_free, |
