diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2011-05-11 13:37:52 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2011-05-11 13:37:52 +0000 |
| commit | 9472baae0d17ddf425f891a3154057356217af08 (patch) | |
| tree | 8ceed735328184e381c811fe0913264f1327fea1 /ssl/ssl_sess.c | |
| parent | ae17b9ecd5d243c93b071c6be309b4f230a1aa52 (diff) | |
Backport TLS v1.2 support from HEAD.
This includes TLS v1.2 server and client support but at present
client certificate support is not implemented.
Diffstat (limited to 'ssl/ssl_sess.c')
| -rw-r--r-- | ssl/ssl_sess.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c index 3f0b19558d..cbb7e70352 100644 --- a/ssl/ssl_sess.c +++ b/ssl/ssl_sess.c @@ -308,6 +308,11 @@ int ssl_get_new_session(SSL *s, int session) ss->ssl_version=TLS1_1_VERSION; ss->session_id_length=SSL3_SSL_SESSION_ID_LENGTH; } + else if (s->version == TLS1_2_VERSION) + { + ss->ssl_version=TLS1_2_VERSION; + ss->session_id_length=SSL3_SSL_SESSION_ID_LENGTH; + } else if (s->version == DTLS1_BAD_VER) { ss->ssl_version=DTLS1_BAD_VER; |