diff options
| author | Michael Tuexen <tuexen@fh-muenster.de> | 2013-08-13 18:53:19 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2013-08-13 18:59:41 +0100 |
| commit | 6f87807e629ee10ec0006b39d8851af8c5ade67b (patch) | |
| tree | 5b159bc1d7dc68387b8a8a05da942d1bbfc185ad | |
| parent | 799f203ff6933807f43e9e0692ec2741d4d83d59 (diff) | |
DTLS message_sequence number wrong in rehandshake ServerHello
This fix ensures that
* A HelloRequest is retransmitted if not responded by a ClientHello
* The HelloRequest "consumes" the sequence number 0. The subsequent
ServerHello uses the sequence number 1.
* The client also expects the sequence number of the ServerHello to
be 1 if a HelloRequest was received earlier.
This patch fixes the RFC violation.
(cherry picked from commit b62f4daac00303280361924b9cc19b3e27528b15)
Conflicts:
ssl/d1_pkt.c
| -rw-r--r-- | ssl/d1_pkt.c | 1 | ||||
| -rw-r--r-- | ssl/d1_srvr.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/ssl/d1_pkt.c b/ssl/d1_pkt.c index eb68030d14..cbefaecf8f 100644 --- a/ssl/d1_pkt.c +++ b/ssl/d1_pkt.c @@ -984,6 +984,7 @@ start: !(s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS) && !s->s3->renegotiate) { + s->d1->handshake_read_seq++; ssl3_renegotiate(s); if (ssl3_renegotiate_check(s)) { diff --git a/ssl/d1_srvr.c b/ssl/d1_srvr.c index 41fac4c688..0c66d707a2 100644 --- a/ssl/d1_srvr.c +++ b/ssl/d1_srvr.c @@ -248,10 +248,11 @@ int dtls1_accept(SSL *s) case SSL3_ST_SW_HELLO_REQ_B: s->shutdown=0; + dtls1_clear_record_buffer(s); dtls1_start_timer(s); ret=dtls1_send_hello_request(s); if (ret <= 0) goto end; - s->s3->tmp.next_state=SSL3_ST_SW_HELLO_REQ_C; + s->s3->tmp.next_state=SSL3_ST_SR_CLNT_HELLO_A; s->state=SSL3_ST_SW_FLUSH; s->init_num=0; |