diff options
| author | David Benjamin <davidben@chromium.org> | 2014-11-26 08:13:10 +0300 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2014-12-02 22:33:04 +0300 |
| commit | e319a2f73a30147ae118190397a558b8a2a24733 (patch) | |
| tree | 7a7b34f744cd0e0d4deafac496a6c9e8f0f0af2a /ssl/d1_pkt.c | |
| parent | 533ef7304d9b48aad38805f1997031a0a034d7fe (diff) | |
Remove SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS.
It's unused. Also per the previous commit message, it historically had a bug
anyway.
Change-Id: I5868641e7938ddebbc0ffd72d218c81cd17c7739
Reviewed-on: https://boringssl-review.googlesource.com/2437
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'ssl/d1_pkt.c')
| -rw-r--r-- | ssl/d1_pkt.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/ssl/d1_pkt.c b/ssl/d1_pkt.c index 93565806..2f75d2f6 100644 --- a/ssl/d1_pkt.c +++ b/ssl/d1_pkt.c @@ -954,9 +954,7 @@ start: s->msg_callback(0, s->version, SSL3_RT_HANDSHAKE, s->d1->handshake_fragment, 4, s, s->msg_callback_arg); - if (SSL_is_init_finished(s) && - !(s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS) && - !s->s3->renegotiate) + if (SSL_is_init_finished(s) && !s->s3->renegotiate) { s->d1->handshake_read_seq++; s->new_session = 1; @@ -1109,8 +1107,7 @@ start: goto start; } - if (((s->state&SSL_ST_MASK) == SSL_ST_OK) && - !(s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS)) + if ((s->state&SSL_ST_MASK) == SSL_ST_OK) { s->state = s->server ? SSL_ST_ACCEPT : SSL_ST_CONNECT; s->renegotiate=1; |