summaryrefslogtreecommitdiffstats
path: root/ssl/s3_pkt.c
diff options
context:
space:
mode:
authorKen Ballou <ballou@crab.mv.com>2014-06-27 23:17:47 +0100
committerDr. Stephen Henson <steve@openssl.org>2014-06-27 23:18:21 +0100
commit6daba1dc6a445c777ed34149088a44e0b6bfeced (patch)
treea657b5668dfe73b45a434869ac8b443de63935c4 /ssl/s3_pkt.c
parent69b8f2895b119dc53b330a6a512e4d27c1035098 (diff)
Remove redundant check.
PR#3174 (cherry picked from commit fd331c0bb9b557903dd2ce88398570a3327b5ef0)
Diffstat (limited to 'ssl/s3_pkt.c')
-rw-r--r--ssl/s3_pkt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c
index 59011e39c6..eff7356a31 100644
--- a/ssl/s3_pkt.c
+++ b/ssl/s3_pkt.c
@@ -968,7 +968,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)))
{
SSLerr(SSL_F_SSL3_READ_BYTES, ERR_R_INTERNAL_ERROR);