diff options
| author | djm <> | 2012-10-13 21:23:50 +0000 |
|---|---|---|
| committer | djm <> | 2012-10-13 21:23:50 +0000 |
| commit | 228cae30b117c2493f69ad3c195341cd6ec8d430 (patch) | |
| tree | 29ff00b10d52c0978077c4fd83c33b065bade73e /src/lib/libssl/t1_clnt.c | |
| parent | 731838c66b52c0ae5888333005b74115a620aa96 (diff) | |
| download | openbsd-228cae30b117c2493f69ad3c195341cd6ec8d430.tar.gz openbsd-228cae30b117c2493f69ad3c195341cd6ec8d430.tar.bz2 openbsd-228cae30b117c2493f69ad3c195341cd6ec8d430.zip | |
import OpenSSL-1.0.1c
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libssl/t1_clnt.c | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/src/lib/libssl/t1_clnt.c b/src/lib/libssl/t1_clnt.c index c87af17712..578617ed84 100644 --- a/src/lib/libssl/t1_clnt.c +++ b/src/lib/libssl/t1_clnt.c | |||
| @@ -66,13 +66,26 @@ | |||
| 66 | static const SSL_METHOD *tls1_get_client_method(int ver); | 66 | static const SSL_METHOD *tls1_get_client_method(int ver); |
| 67 | static const SSL_METHOD *tls1_get_client_method(int ver) | 67 | static const SSL_METHOD *tls1_get_client_method(int ver) |
| 68 | { | 68 | { |
| 69 | if (ver == TLS1_2_VERSION) | ||
| 70 | return TLSv1_2_client_method(); | ||
| 71 | if (ver == TLS1_1_VERSION) | ||
| 72 | return TLSv1_1_client_method(); | ||
| 69 | if (ver == TLS1_VERSION) | 73 | if (ver == TLS1_VERSION) |
| 70 | return(TLSv1_client_method()); | 74 | return TLSv1_client_method(); |
| 71 | else | 75 | return NULL; |
| 72 | return(NULL); | ||
| 73 | } | 76 | } |
| 74 | 77 | ||
| 75 | IMPLEMENT_tls1_meth_func(TLSv1_client_method, | 78 | IMPLEMENT_tls_meth_func(TLS1_2_VERSION, TLSv1_2_client_method, |
| 79 | ssl_undefined_function, | ||
| 80 | ssl3_connect, | ||
| 81 | tls1_get_client_method) | ||
| 82 | |||
| 83 | IMPLEMENT_tls_meth_func(TLS1_1_VERSION, TLSv1_1_client_method, | ||
| 84 | ssl_undefined_function, | ||
| 85 | ssl3_connect, | ||
| 86 | tls1_get_client_method) | ||
| 87 | |||
| 88 | IMPLEMENT_tls_meth_func(TLS1_VERSION, TLSv1_client_method, | ||
| 76 | ssl_undefined_function, | 89 | ssl_undefined_function, |
| 77 | ssl3_connect, | 90 | ssl3_connect, |
| 78 | tls1_get_client_method) | 91 | tls1_get_client_method) |
