diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2011-09-01 14:02:23 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2011-09-01 14:02:23 +0000 |
| commit | d41ce00b8c3b6dbcc0ef29db14d335d824f4cdb2 (patch) | |
| tree | ac8137fd09f257bbedb1343c6184a76d5a273f9b /ssl | |
| parent | 04485c5bc0dc7f49940e6d91b27cdcc7b83a8ab5 (diff) | |
PR: 2573
Submitted by: Robin Seggelmann <seggelmann@fh-muenster.de>
Reviewed by: steve
Fix DTLS buffering and decryption bug.
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/d1_pkt.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/ssl/d1_pkt.c b/ssl/d1_pkt.c index 467711077e..77da0c975a 100644 --- a/ssl/d1_pkt.c +++ b/ssl/d1_pkt.c @@ -409,13 +409,13 @@ dtls1_process_record(SSL *s) enc_err = s->method->ssl3_enc->enc(s,0); if (enc_err <= 0) { - if (enc_err == 0) - /* SSLerr() and ssl3_send_alert() have been called */ - goto err; - - /* otherwise enc_err == -1 */ - al=SSL_AD_BAD_RECORD_MAC; - goto f_err; + /* decryption failed, silently discard message */ + if (enc_err < 0) + { + rr->length = 0; + s->packet_length = 0; + } + goto err; } #ifdef TLS_DEBUG @@ -658,10 +658,12 @@ again: /* If this record is from the next epoch (either HM or ALERT), * and a handshake is currently in progress, buffer it since it - * cannot be processed at this time. */ + * cannot be processed at this time. However, do not buffer + * anything while listening. + */ if (is_next_epoch) { - if (SSL_in_init(s) || s->in_handshake) + if ((SSL_in_init(s) || s->in_handshake) && !s->d1->listen) { dtls1_buffer_record(s, &(s->d1->unprocessed_rcds), rr->seq_num); } |