From 423c66f10e3762643020601bf76cec3309f1474d Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Thu, 7 Jan 2010 19:04:52 +0000 Subject: [PATCH] Simplify RI+SCSV logic: 1. Send SCSV is not renegotiating, never empty RI. 2. Send RI if renegotiating. --- ssl/ssl_lib.c | 5 ++--- ssl/t1_lib.c | 5 +++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index ee01a2c879..6142b08872 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -1370,10 +1370,9 @@ int ssl_cipher_list_to_bytes(SSL *s,STACK_OF(SSL_CIPHER) *sk,unsigned char *p, p+=j; } /* If p == q, no ciphers and caller indicates an error. Otherwise - * add SCSV if no extensions (i.e. SSL3 is client_version) - * since spec RECOMMENDS not sending both RI and SCSV. + * add SCSV if not renegotiating. */ - if (p != q && !s->new_session && s->client_version == SSL3_VERSION) + if (p != q && !s->new_session) { static SSL_CIPHER scsv = { diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c index c467034664..b50d2a52f6 100644 --- a/ssl/t1_lib.c +++ b/ssl/t1_lib.c @@ -316,8 +316,9 @@ unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *p, unsigned cha ret+=size_str; } - /* Add the renegotiation option: TODOEKR switch */ - { + /* Add RI if renegotiating */ + if (s->new_session) + { int el; if(!ssl_add_clienthello_renegotiate_ext(s, 0, &el, 0)) -- 2.34.1