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:39 +0100 |
| commit | 0b33bed9696ffda5f56eb7ebb5765204df6df978 (patch) | |
| tree | d96eb0ced3632cde1bd8efb1bba4e4ef4e6bcf47 /ssl | |
| parent | 59deb33cbe8ade8f8000b8d86198d8e276a2d19f (diff) | |
| download | openssl-new-0b33bed9696ffda5f56eb7ebb5765204df6df978.tar.gz | |
Remove redundant check.
PR#3174
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 bba8f3df57..243992542b 100644 --- a/ssl/s3_pkt.c +++ b/ssl/s3_pkt.c @@ -1247,7 +1247,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); |