From 46cfb0e4ee097033c8dc20cea59cb9aef8e2e149 Mon Sep 17 00:00:00 2001 From: Adam Langley Date: Thu, 24 Jul 2014 17:30:28 -0700 Subject: [PATCH] Remove redundant check. PR#3174 (Imported from upstream's ec77f276e14f4b835cdd42fa175d74dcda532663) Change-Id: I7e33d67c201bdd088520d060cc8e4e9713223e69 --- ssl/s3_pkt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c index 4191059bc..2793b2fe6 100644 --- a/ssl/s3_pkt.c +++ b/ssl/s3_pkt.c @@ -955,7 +955,7 @@ int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek) if (!ssl3_setup_read_buffer(s)) return(-1); - if ((type && (type != SSL3_RT_APPLICATION_DATA) && (type != SSL3_RT_HANDSHAKE) && type) || + if ((type && (type != SSL3_RT_APPLICATION_DATA) && (type != SSL3_RT_HANDSHAKE)) || (peek && (type != SSL3_RT_APPLICATION_DATA))) { OPENSSL_PUT_ERROR(SSL, ssl3_read_bytes, ERR_R_INTERNAL_ERROR);