From: Ken Ballou <ballou@crab.mv.com>
Date: Fri, 27 Jun 2014 22:17:47 +0000 (+0100)
Subject: Remove redundant check.
X-Git-Tag: OpenSSL_0_9_8zb~49
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0e2458e1876a48a0f95c765209ffcf4667310721;p=oweals%2Fopenssl.git

Remove redundant check.

PR#3174
(cherry picked from commit fd331c0bb9b557903dd2ce88398570a3327b5ef0)
---

diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c
index a419470649..dbbee635c9 100644
--- a/ssl/s3_pkt.c
+++ b/ssl/s3_pkt.c
@@ -838,7 +838,7 @@ int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
 		if (!ssl3_setup_buffers(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)))
 		{
 		SSLerr(SSL_F_SSL3_READ_BYTES, ERR_R_INTERNAL_ERROR);