Don't crash when processing a zero-length, TLS >= 1.1 record.
authorBen Laurie <ben@links.org>
Mon, 28 Jan 2013 17:33:18 +0000 (17:33 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Tue, 5 Feb 2013 16:50:33 +0000 (16:50 +0000)
commitb3a959a337b8083bc855623f24cebaf43a477350
tree43d6f17c5ed90d33a78c97a59a6d63b6c67a47eb
parent2928cb4c82d6516d9e65ede4901a5957d8c39c32
Don't crash when processing a zero-length, TLS >= 1.1 record.

The previous CBC patch was bugged in that there was a path through enc()
in s3_pkt.c/d1_pkt.c which didn't set orig_len. orig_len would be left
at the previous value which could suggest that the packet was a
sufficient length when it wasn't.
(cherry picked from commit 6cb19b7681f600b2f165e4adc57547b097b475fd)
(cherry picked from commit 2c948c1bb218f4ae126e14fd3453d42c62b93235)

Conflicts:
ssl/s3_enc.c
ssl/d1_enc.c
ssl/d1_pkt.c
ssl/s3_enc.c
ssl/s3_pkt.c
ssl/t1_enc.c