summaryrefslogtreecommitdiffstats
path: root/ssl/d1_pkt.c
diff options
context:
space:
mode:
authorHans Wennborg <hans@chromium.org>2014-08-15 00:54:00 -0400
committerRich Salz <rsalz@akamai.com>2014-08-15 10:45:00 -0400
commit01e438f28844ad4f3fd7e8d772031524593d6441 (patch)
treecf2511fe6e8b80db96493a17f681af6192660458 /ssl/d1_pkt.c
parent5effa35610f673bc3837b8972f7122b233ecbc54 (diff)
RT3023: Redundant logical expressions
Remove some redundant logical expressions Reviewed-by: Emilia Kasper <emilia@silkandcyanide.net>
Diffstat (limited to 'ssl/d1_pkt.c')
-rw-r--r--ssl/d1_pkt.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/ssl/d1_pkt.c b/ssl/d1_pkt.c
index 611fc8db57..ed246a0078 100644
--- a/ssl/d1_pkt.c
+++ b/ssl/d1_pkt.c
@@ -758,9 +758,8 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
if (!ssl3_setup_buffers(s))
return(-1);
- /* XXX: check what the second '&& type' is about */
if ((type && (type != SSL3_RT_APPLICATION_DATA) &&
- (type != SSL3_RT_HANDSHAKE) && type) ||
+ (type != SSL3_RT_HANDSHAKE)) ||
(peek && (type != SSL3_RT_APPLICATION_DATA)))
{
SSLerr(SSL_F_DTLS1_READ_BYTES, ERR_R_INTERNAL_ERROR);