diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2014-05-27 18:51:25 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2014-05-27 18:51:25 +0000 |
| commit | 9c420afbd0645fc4e315c08d4baca45963a2fc66 (patch) | |
| tree | 1c09600cb48068647dca49ae80cc9a63b2f29d4f /lib/libssl/s3_pkt.c | |
| parent | 41737f9e60f65b05ef93859d45c060588a85958e (diff) | |
Remove redundant test introduced in s3_pkt.c on 20001225, which got cargo-culted
(with an XXX comment, though) in d1_pkt.c in 2005.
Diffstat (limited to 'lib/libssl/s3_pkt.c')
| -rw-r--r-- | lib/libssl/s3_pkt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libssl/s3_pkt.c b/lib/libssl/s3_pkt.c index da6c860cfc7..3a167f058c0 100644 --- a/lib/libssl/s3_pkt.c +++ b/lib/libssl/s3_pkt.c @@ -907,8 +907,8 @@ ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek) 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); return -1; |