From c42b8a6e4bced8f6ecf0a0d9a0107e6e989da0c2 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Wed, 24 Aug 2016 11:28:58 +0100 Subject: Remove some dead code from rec_layer_s3.c It is never valid to call ssl3_read_bytes with type == SSL3_RT_CHANGE_CIPHER_SPEC, and in fact we check for valid values for type near the beginning of the function. Therefore this check will never be true and can be removed. Reviewed-by: Tim Hudson --- ssl/record/rec_layer_s3.c | 6 ------ 1 file changed, 6 deletions(-) (limited to 'ssl') diff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c index 52a8dcf4e5..46870c054b 100644 --- a/ssl/record/rec_layer_s3.c +++ b/ssl/record/rec_layer_s3.c @@ -1159,12 +1159,6 @@ int ssl3_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, * were actually expecting a CCS). */ - if (rr->type == SSL3_RT_HANDSHAKE && type == SSL3_RT_CHANGE_CIPHER_SPEC) { - al = SSL_AD_UNEXPECTED_MESSAGE; - SSLerr(SSL_F_SSL3_READ_BYTES, SSL_R_UNEXPECTED_MESSAGE); - goto f_err; - } - /* * Lets just double check that we've not got an SSLv2 record */ -- cgit v1.2.3