commit 46cfb0e4ee097033c8dc20cea59cb9aef8e2e149
author Adam Langley <agl@chromium.org> Thu Jul 24 17:30:28 2014 -0700
committer Adam Langley <agl@chromium.org> Mon Jul 28 17:05:13 2014 -0700
tree 5de1474556081fea2fb780ddae3b20f4802769e8
parent 2811da2ecaf125511349d13d5fd7e1fa74e1a914

Remove redundant check.

PR#3174

(Imported from upstream's ec77f276e14f4b835cdd42fa175d74dcda532663)

Change-Id: I7e33d67c201bdd088520d060cc8e4e9713223e69

ssl/s3_pkt.c

diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c
index 4191059..2793b2f 100644
--- a/ssl/s3_pkt.c
+++ b/ssl/s3_pkt.c
@@ -955,7 +955,7 @@
 		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);