| commit | 0b33bed9696ffda5f56eb7ebb5765204df6df978 | [log] [tgz] |
|---|---|---|
| author | Ken Ballou <ballou@crab.mv.com> | Fri Jun 27 23:17:47 2014 +0100 |
| committer | Dr. Stephen Henson <steve@openssl.org> | Fri Jun 27 23:19:39 2014 +0100 |
| tree | d96eb0ced3632cde1bd8efb1bba4e4ef4e6bcf47 | |
| parent | 59deb33cbe8ade8f8000b8d86198d8e276a2d19f [diff] [blame] |
Remove redundant check. PR#3174
diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c index bba8f3d..2439925 100644 --- a/ssl/s3_pkt.c +++ b/ssl/s3_pkt.c
@@ -1247,7 +1247,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))) { SSLerr(SSL_F_SSL3_READ_BYTES, ERR_R_INTERNAL_ERROR);