summaryrefslogtreecommitdiffstats
path: root/ssl/t1_lib.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2009-11-08 14:30:22 +0000
committerDr. Stephen Henson <steve@openssl.org>2009-11-08 14:30:22 +0000
commita1dc0336dd482d0ce0e81d7847365de399899d5f (patch)
treedc2758d900a29b3ade0c65d9eb24cc31c34276ad /ssl/t1_lib.c
parentd99a35f275be593de4f89cc94ac968f49dd66654 (diff)
Re-revert (re-insert?) temporary change that made renegotiation work again
and add a proper fix: specifically if it is a new session don't send the old TLS ticket, send a zero length ticket to request a new session.
Diffstat (limited to 'ssl/t1_lib.c')
-rw-r--r--ssl/t1_lib.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index c9a81f243d..247854e124 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -177,7 +177,7 @@ unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *p, unsigned cha
if (!(SSL_get_options(s) & SSL_OP_NO_TICKET))
{
int ticklen;
- if (s->session && s->session->tlsext_tick)
+ if (!s->new_session && s->session && s->session->tlsext_tick)
ticklen = s->session->tlsext_ticklen;
else
ticklen = 0;