diff options
Diffstat (limited to 'src/lib/libssl/s3_clnt.c')
-rw-r--r-- | src/lib/libssl/s3_clnt.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/lib/libssl/s3_clnt.c b/src/lib/libssl/s3_clnt.c index b739711732..30f679eac3 100644 --- a/src/lib/libssl/s3_clnt.c +++ b/src/lib/libssl/s3_clnt.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: s3_clnt.c,v 1.121 2015/07/29 19:16:09 miod Exp $ */ | 1 | /* $OpenBSD: s3_clnt.c,v 1.122 2015/08/27 06:21:15 doug 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 | * |
@@ -170,12 +170,6 @@ | |||
170 | 170 | ||
171 | #include "bytestring.h" | 171 | #include "bytestring.h" |
172 | 172 | ||
173 | #ifdef __OpenBSD__ | ||
174 | #include <sys/cdefs.h> | ||
175 | __warn_references(SSLv3_client_method, | ||
176 | "SSLv3_client_method() enables the use of insecure protocols"); | ||
177 | #endif | ||
178 | |||
179 | static const SSL_METHOD *ssl3_get_client_method(int ver); | 173 | static const SSL_METHOD *ssl3_get_client_method(int ver); |
180 | static int ca_dn_cmp(const X509_NAME * const *a, const X509_NAME * const *b); | 174 | static int ca_dn_cmp(const X509_NAME * const *a, const X509_NAME * const *b); |
181 | 175 | ||
@@ -211,17 +205,9 @@ const SSL_METHOD SSLv3_client_method_data = { | |||
211 | .ssl_ctx_callback_ctrl = ssl3_ctx_callback_ctrl, | 205 | .ssl_ctx_callback_ctrl = ssl3_ctx_callback_ctrl, |
212 | }; | 206 | }; |
213 | 207 | ||
214 | const SSL_METHOD * | ||
215 | SSLv3_client_method(void) | ||
216 | { | ||
217 | return &SSLv3_client_method_data; | ||
218 | } | ||
219 | |||
220 | static const SSL_METHOD * | 208 | static const SSL_METHOD * |
221 | ssl3_get_client_method(int ver) | 209 | ssl3_get_client_method(int ver) |
222 | { | 210 | { |
223 | if (ver == SSL3_VERSION) | ||
224 | return (SSLv3_client_method()); | ||
225 | return (NULL); | 211 | return (NULL); |
226 | } | 212 | } |
227 | 213 | ||