summaryrefslogtreecommitdiffstats
path: root/ssl/ssl_sess.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2010-06-27 14:22:11 +0000
committerDr. Stephen Henson <steve@openssl.org>2010-06-27 14:22:11 +0000
commitb4b15f68c01c4bf4557db5ff6180623411540b52 (patch)
treedc8969be13937ea8b79125e68494497474c2b1ab /ssl/ssl_sess.c
parent1eb1cf452b1263373ff3f7c91b9419adca8c3ba8 (diff)
Backport TLS v1.1 support from HEAD, ssl/ changes
Diffstat (limited to 'ssl/ssl_sess.c')
-rw-r--r--ssl/ssl_sess.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c
index 8e5d8a0972..56b9e157ed 100644
--- a/ssl/ssl_sess.c
+++ b/ssl/ssl_sess.c
@@ -300,6 +300,11 @@ int ssl_get_new_session(SSL *s, int session)
ss->ssl_version=TLS1_VERSION;
ss->session_id_length=SSL3_SSL_SESSION_ID_LENGTH;
}
+ else if (s->version == TLS1_1_VERSION)
+ {
+ ss->ssl_version=TLS1_1_VERSION;
+ ss->session_id_length=SSL3_SSL_SESSION_ID_LENGTH;
+ }
else if (s->version == DTLS1_BAD_VER)
{
ss->ssl_version=DTLS1_BAD_VER;