summaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2016-08-24 11:28:58 +0100
committerMatt Caswell <matt@openssl.org>2016-08-24 11:28:58 +0100
commitc42b8a6e4bced8f6ecf0a0d9a0107e6e989da0c2 (patch)
treebc8f7bd8bae6b50c0fb25040bb72d1e5d189abe1 /ssl
parentfe81a1b0515bf51983150dc7c428ed4c9fd31c7a (diff)
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 <tjh@openssl.org>
Diffstat (limited to 'ssl')
-rw-r--r--ssl/record/rec_layer_s3.c6
1 files changed, 0 insertions, 6 deletions
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
*/