diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2010-06-27 14:22:11 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2010-06-27 14:22:11 +0000 |
| commit | b4b15f68c01c4bf4557db5ff6180623411540b52 (patch) | |
| tree | dc8969be13937ea8b79125e68494497474c2b1ab /ssl/ssl_lib.c | |
| parent | 1eb1cf452b1263373ff3f7c91b9419adca8c3ba8 (diff) | |
Backport TLS v1.1 support from HEAD, ssl/ changes
Diffstat (limited to 'ssl/ssl_lib.c')
| -rw-r--r-- | ssl/ssl_lib.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 912592b8bb..3c74ec179c 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -2423,8 +2423,10 @@ SSL_METHOD *ssl_bad_method(int ver) const char *SSL_get_version(const SSL *s) { - if (s->version == TLS1_VERSION) - return("TLSv1"); + if (s->version == TLS1_1_VERSION) + return("TLSv1.1"); + else if (s->version == SSL3_VERSION) + return("SSLv3"); else if (s->version == SSL3_VERSION) return("SSLv3"); else if (s->version == SSL2_VERSION) |