diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2010-08-27 12:12:07 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2010-08-27 12:12:07 +0000 |
commit | 36778eb231fb7c0fba2925a370a60271475a0e95 (patch) | |
tree | 888d1105a4bba74be10a1afdaed3079d389e8e90 /ssl/t1_lib.c | |
parent | c6dd154b3e410f72e09ff472fe4e70ebf02173f8 (diff) |
PR: 1833
Submitted By: Robin Seggelmann <seggelmann@fh-muenster.de>
Fix other cases not covered by original patch. (correct patch this time!)
Diffstat (limited to 'ssl/t1_lib.c')
-rw-r--r-- | ssl/t1_lib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c index ef40e5e6f8..521a419781 100644 --- a/ssl/t1_lib.c +++ b/ssl/t1_lib.c @@ -317,7 +317,7 @@ unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *p, unsigned cha } /* Add RI if renegotiating */ - if (s->new_session) + if (s->renegotiate) { int el; @@ -969,7 +969,7 @@ int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char *d, in /* Need RI if renegotiating */ - if (!renegotiate_seen && s->new_session && + if (!renegotiate_seen && s->renegotiate && !(s->options & SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION)) { *al = SSL_AD_HANDSHAKE_FAILURE; |