summaryrefslogtreecommitdiffstats
path: root/ssl/t1_lib.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2010-01-07 19:09:32 +0000
committerDr. Stephen Henson <steve@openssl.org>2010-01-07 19:09:32 +0000
commit3798a4d0597c8c665b41f6211f22c763b22f245b (patch)
tree8b8dd1ed2da65f7e6ba30c0d8ee86618647b0fad /ssl/t1_lib.c
parent5b8246d6eb31b88709b4fc1e1d5318be2cc0ca6f (diff)
Simplify RI+SCSV logic:
1. Send SCSV is not renegotiating, never empty RI. 2. Send RI if renegotiating.
Diffstat (limited to 'ssl/t1_lib.c')
-rw-r--r--ssl/t1_lib.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 8625b57104..ce24f89746 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -174,9 +174,10 @@ 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))