diff options
| author | Ken Ballou <ballou@crab.mv.com> | 2014-06-27 23:17:47 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2014-06-27 23:19:37 +0100 |
| commit | ec77f276e14f4b835cdd42fa175d74dcda532663 (patch) | |
| tree | 9a3124ebbdc729d833ca1ed32aa6618bbbe70a60 /ssl | |
| parent | d0ba994483a1e8c57fac5f6149004d58628ca44e (diff) | |
Remove redundant check.
PR#3174
(cherry picked from commit fd331c0bb9b557903dd2ce88398570a3327b5ef0)
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/s3_pkt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c index 735f67ad73..23fed7077b 100644 --- a/ssl/s3_pkt.c +++ b/ssl/s3_pkt.c @@ -1152,7 +1152,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); |