diff options
| author | Andy Polyakov <appro@openssl.org> | 2013-02-07 22:47:05 +0100 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2013-02-08 11:14:12 +0100 |
| commit | f73546df92a60812a68535b9dbdf1cef7f971569 (patch) | |
| tree | c822943ca8cabe947060393527843741d9aaae22 | |
| parent | be125aa5bae0b6baac526890c835e10378b6df74 (diff) | |
ssl/[d1|s3]_pkt.c: harmomize orig_len handling.
(cherry picked from commit 8545f73b8919770a5d012fe7a82d6785b69baa27)
| -rw-r--r-- | ssl/d1_pkt.c | 4 | ||||
| -rw-r--r-- | ssl/s3_pkt.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/ssl/d1_pkt.c b/ssl/d1_pkt.c index 37257ac298..9b013e491c 100644 --- a/ssl/d1_pkt.c +++ b/ssl/d1_pkt.c @@ -402,7 +402,6 @@ dtls1_process_record(SSL *s) /* decrypt in place in 'rr->input' */ rr->data=rr->input; - orig_len=rr->length; enc_err = s->method->ssl3_enc->enc(s,0); /* enc_err is: @@ -434,6 +433,9 @@ printf("\n"); mac_size=EVP_MD_CTX_size(s->read_hash); OPENSSL_assert(mac_size <= EVP_MAX_MD_SIZE); + /* kludge: *_cbc_remove_padding passes padding length in rr->type */ + orig_len = rr->length+((unsigned int)rr->type>>8); + /* orig_len is the length of the record before any padding was * removed. This is public information, as is the MAC in use, * therefore we can safely process the record in a different diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c index 39818ecdef..a41279eaf4 100644 --- a/ssl/s3_pkt.c +++ b/ssl/s3_pkt.c @@ -397,7 +397,6 @@ fprintf(stderr, "Record type=%d, Length=%d\n", rr->type, rr->length); /* decrypt in place in 'rr->input' */ rr->data=rr->input; - orig_len=rr->length; enc_err = s->method->ssl3_enc->enc(s,0); /* enc_err is: @@ -428,6 +427,9 @@ printf("\n"); mac_size=EVP_MD_CTX_size(s->read_hash); OPENSSL_assert(mac_size <= EVP_MAX_MD_SIZE); + /* kludge: *_cbc_remove_padding passes padding length in rr->type */ + orig_len = rr->length+((unsigned int)rr->type>>8); + /* orig_len is the length of the record before any padding was * removed. This is public information, as is the MAC in use, * therefore we can safely process the record in a different |