From 6867f4854eeb9e904880e5c41d8bab76a24bda09 Mon Sep 17 00:00:00 2001 From: David Benjamin Date: Sat, 1 Nov 2014 03:42:00 -0400 Subject: [PATCH] Remove #if 0'd code documenting an old bug. It was a bug anyway. Change-Id: I59d680ce3615a4b24e72a9b6fa16939d83cc15ac Reviewed-on: https://boringssl-review.googlesource.com/2234 Reviewed-by: Adam Langley --- ssl/d1_pkt.c | 8 -------- ssl/s3_pkt.c | 8 -------- 2 files changed, 16 deletions(-) diff --git a/ssl/d1_pkt.c b/ssl/d1_pkt.c index 2022ece9a..dae47d714 100644 --- a/ssl/d1_pkt.c +++ b/ssl/d1_pkt.c @@ -1104,15 +1104,7 @@ start: if (((s->state&SSL_ST_MASK) == SSL_ST_OK) && !(s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS)) { -#if 0 /* worked only because C operator preferences are not as expected (and - * because this is not really needed for clients except for detecting - * protocol violations): */ - s->state=SSL_ST_BEFORE|(s->server) - ?SSL_ST_ACCEPT - :SSL_ST_CONNECT; -#else s->state = s->server ? SSL_ST_ACCEPT : SSL_ST_CONNECT; -#endif s->renegotiate=1; s->new_session=1; } diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c index d0e185621..28da7f4c5 100644 --- a/ssl/s3_pkt.c +++ b/ssl/s3_pkt.c @@ -1298,15 +1298,7 @@ start: if (((s->state&SSL_ST_MASK) == SSL_ST_OK) && !(s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS)) { -#if 0 /* worked only because C operator preferences are not as expected (and - * because this is not really needed for clients except for detecting - * protocol violations): */ - s->state=SSL_ST_BEFORE|(s->server) - ?SSL_ST_ACCEPT - :SSL_ST_CONNECT; -#else s->state = s->server ? SSL_ST_ACCEPT : SSL_ST_CONNECT; -#endif s->renegotiate=1; s->new_session=1; }