Commit 01e438f2 authored by Hans Wennborg's avatar Hans Wennborg Committed by Rich Salz
Browse files

RT3023: Redundant logical expressions 



Remove some redundant logical expressions

Reviewed-by: default avatarEmilia Kasper <emilia@silkandcyanide.net>
parent 5effa356

crypto/asn1/a_print.c

+0 −1
Original line number Diff line number Diff line
@@ -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 == ')') ||

ssl/d1_pkt.c

+1 −2
Original line number Diff line number Diff line
@@ -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);