Tolerate encrypted or plaintext alerts
authorMatt Caswell <matt@openssl.org>
Tue, 7 Aug 2018 11:40:08 +0000 (12:40 +0100)
committerMatt Caswell <matt@openssl.org>
Wed, 8 Aug 2018 09:16:58 +0000 (10:16 +0100)
commitde9e884b2f43c59834c2b1c3cfde35fa2c797f2b
tree6e696fc5f4b219da631d844d68cd9a392e966099
parent7426cd343d99d3d82e3fb06c8df18e5cc6bcec75
Tolerate encrypted or plaintext alerts

At certain points in the handshake we could receive either a plaintext or
an encrypted alert from the client. We should tolerate both where
appropriate.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6887)
ssl/record/rec_layer_s3.c
ssl/record/ssl3_record.c
ssl/record/ssl3_record_tls13.c
ssl/statem/statem.h
ssl/statem/statem_lib.c
ssl/statem/statem_srvr.c