Fix IV check and padding removal.
authorDr. Stephen Henson <steve@openssl.org>
Thu, 7 Feb 2013 21:06:37 +0000 (21:06 +0000)
committerAndy Polyakov <appro@openssl.org>
Fri, 8 Feb 2013 10:12:49 +0000 (11:12 +0100)
commitbe125aa5bae0b6baac526890c835e10378b6df74
tree257e93490d9971d3b259524b9f080bb7579b60e6
parent413cbfe68d83f9afc726b7234c49bd5ccddb97b4
Fix IV check and padding removal.

Fix the calculation that checks there is enough room in a record
after removing padding and optional explicit IV. (by Steve)

For AEAD remove the correct number of padding bytes (by Andy)
(cherry picked from commit 32cc2479b473c49ce869e57fded7e9a77b695c0d)

Resolved conflicts:

ssl/s3_cbc.c
ssl/s3_cbc.c