diff options
| author | Ben Laurie <ben@links.org> | 2013-01-28 17:34:33 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2013-02-05 16:50:33 +0000 |
| commit | be88529753897c29c677d1becb321f0072c0659c (patch) | |
| tree | 3ef966662f346103f935b7783073501b09a9504a /ssl/s3_pkt.c | |
| parent | b3a959a337b8083bc855623f24cebaf43a477350 (diff) | |
Update DTLS code to match CBC decoding in TLS.
This change updates the DTLS code to match the constant-time CBC
behaviour in the TLS.
(cherry picked from commit 9f27de170d1b7bef3d46d41382dc4dafde8b3900)
(cherry picked from commit 5e4ca556e970edb8a7f364fcb6ee6818a965a60b)
Conflicts:
ssl/d1_enc.c
ssl/d1_pkt.c
ssl/s3_pkt.c
Diffstat (limited to 'ssl/s3_pkt.c')
| -rw-r--r-- | ssl/s3_pkt.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c index e658edbb1d..9f5abd516d 100644 --- a/ssl/s3_pkt.c +++ b/ssl/s3_pkt.c @@ -247,7 +247,6 @@ static int ssl3_get_record(SSL *s) unsigned char md[EVP_MAX_MD_SIZE]; short version; unsigned mac_size; - int clear=0; size_t extra; rr= &(s->s3->rrec); @@ -361,8 +360,9 @@ again: * -1: if the padding is invalid */ if (enc_err == 0) { - /* SSLerr() and ssl3_send_alert() have been called */ - goto err; + al=SSL_AD_DECRYPTION_FAILED; + SSLerr(SSL_F_TLS1_ENC,SSL_R_BLOCK_CIPHER_PAD_IS_WRONG); + goto f_err; } #ifdef TLS_DEBUG @@ -372,14 +372,11 @@ printf("\n"); #endif /* r->length is now the compressed data plus mac */ - if ( (sess == NULL) || - (s->enc_read_ctx == NULL) || - (s->read_hash == NULL)) - clear=1; - - if (!clear) + if ((sess != NULL) && + (s->enc_read_ctx != NULL) && + (s->read_hash != NULL)) { - /* !clear => s->read_hash != NULL => mac_size != -1 */ + /* s->read_hash != NULL => mac_size != -1 */ unsigned char *mac = NULL; unsigned char mac_tmp[EVP_MAX_MD_SIZE]; mac_size=EVP_MD_size(s->read_hash); |