diff options
| author | jkim <jkim@FreeBSD.org> | 2012-07-12 19:30:53 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2012-07-12 19:30:53 +0000 |
| commit | e393e47b1e23744a7d0ed999afb5d137070f5f8f (patch) | |
| tree | 9739a803477c4610ec6628d914bdcc55fbb3602a /crypto/openssl/ssl/s23_meth.c | |
| parent | a8b00dea2cde4c3d96e6ed1de530ddff21012266 (diff) | |
| parent | 532b4084cb8cac5e6d91d42aa6a497dd4ba4a4f5 (diff) | |
| download | FreeBSD-src-e393e47b1e23744a7d0ed999afb5d137070f5f8f.zip FreeBSD-src-e393e47b1e23744a7d0ed999afb5d137070f5f8f.tar.gz | |
Merge OpenSSL 1.0.1c.
Approved by: benl (maintainer)
Diffstat (limited to 'crypto/openssl/ssl/s23_meth.c')
| -rw-r--r-- | crypto/openssl/ssl/s23_meth.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/crypto/openssl/ssl/s23_meth.c b/crypto/openssl/ssl/s23_meth.c index 950d9aa..40eae0f 100644 --- a/crypto/openssl/ssl/s23_meth.c +++ b/crypto/openssl/ssl/s23_meth.c @@ -60,8 +60,8 @@ #include <openssl/objects.h> #include "ssl_locl.h" -static SSL_METHOD *ssl23_get_method(int ver); -static SSL_METHOD *ssl23_get_method(int ver) +static const SSL_METHOD *ssl23_get_method(int ver); +static const SSL_METHOD *ssl23_get_method(int ver) { #ifndef OPENSSL_NO_SSL2 if (ver == SSL2_VERSION) @@ -76,6 +76,10 @@ static SSL_METHOD *ssl23_get_method(int ver) #ifndef OPENSSL_NO_TLS1 if (ver == TLS1_VERSION) return(TLSv1_method()); + else if (ver == TLS1_1_VERSION) + return(TLSv1_1_method()); + else if (ver == TLS1_2_VERSION) + return(TLSv1_2_method()); else #endif return(NULL); |
