From: Hans Wennborg <hans@chromium.org>
Date: Fri, 15 Aug 2014 04:54:00 +0000 (-0400)
Subject: RT3023: Redundant logical expressions
X-Git-Tag: master-post-reformat~515
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=01e438f28844ad4f3fd7e8d772031524593d6441

RT3023: Redundant logical expressions

Remove some redundant logical expressions

Reviewed-by: Emilia Kasper <emilia@silkandcyanide.net>
---

diff --git a/crypto/asn1/a_print.c b/crypto/asn1/a_print.c
index d18e772320..2e4c5b5f13 100644
--- a/crypto/asn1/a_print.c
+++ b/crypto/asn1/a_print.c
@@ -75,7 +75,6 @@ int ASN1_PRINTABLE_type(const unsigned char *s, int len)
 #ifndef CHARSET_EBCDIC
 		if (!(	((c >= 'a') && (c <= 'z')) ||
 			((c >= 'A') && (c <= 'Z')) ||
-			(c == ' ') ||
 			((c >= '0') && (c <= '9')) ||
 			(c == ' ') || (c == '\'') ||
 			(c == '(') || (c == ')') ||
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);