RT3023: Redundant logical expressions

[openssl.git] / ssl / d1_pkt.c

diff --git a/ssl/d1_pkt.c b/ssl/d1_pkt.c
index 611fc8db5769fb749ac7a289be7f7de2150f6738..ed246a007807c9c59e96664e28f9154254150377 100644 (file)
--- 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);
 
                if (!ssl3_setup_buffers(s))
                        return(-1);
 

-    /* XXX: check what the second '&& type' is about */

        if ((type && (type != SSL3_RT_APPLICATION_DATA) && 
        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);
            (peek && (type != SSL3_RT_APPLICATION_DATA)))
                {
                SSLerr(SSL_F_DTLS1_READ_BYTES, ERR_R_INTERNAL_ERROR);