Re: [openssl.org #3305] Cppcheck report

[Huzaifa Sidhpurwala]

The enclosed patch addresses all the issues discussed above.




On Wed, Jun 18, 2014 at 2:38 PM, Kurt Cancemi via RT <r...@openssl.org> wrote:

> Hello,
>
> The attached patch removes a duplicate or check (the first problem listed
> in this ticket).
>
> Regards,
> Kurt Cancemi
>
>

diff --git a/crypto/store/str_lib.c b/crypto/store/str_lib.c
index f1dbcbd..4de1d34 100644
--- a/crypto/store/str_lib.c
+++ b/crypto/store/str_lib.c
@@ -667,7 +667,7 @@ EVP_PKEY *STORE_get_public_key(STORE *s, OPENSSL_ITEM attributes[],
 
 	object = s->meth->get_object(s, STORE_OBJECT_TYPE_PUBLIC_KEY,
 		attributes, parameters);
-	if (!object || !object->data.key || !object->data.key)
+       if (!object || !object->data.key) 
 		{
 		STOREerr(STORE_F_STORE_GET_PUBLIC_KEY,
 			STORE_R_FAILED_GETTING_KEY);
diff --git a/fips/aes/fips_aesavs.c b/fips/aes/fips_aesavs.c
index fecaf99..ca303e8 100644
--- a/fips/aes/fips_aesavs.c
+++ b/fips/aes/fips_aesavs.c
@@ -918,6 +918,7 @@ int main(int argc, char **argv)
 	    if (proc_file(rfn, rspfile))
 		{
 		printf(">>> Processing failed for: %s <<<\n", rfn);
+               fclose(fp);
 		return 1;
 		}
 	    }
diff --git a/ssl/d1_pkt.c b/ssl/d1_pkt.c
index 611fc8d..da41dea 100644
--- a/ssl/d1_pkt.c
+++ b/ssl/d1_pkt.c
@@ -758,11 +758,9 @@ 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) ||
-	    (peek && (type != SSL3_RT_APPLICATION_DATA)))
-		{
+       if ((type && type != SSL3_RT_APPLICATION_DATA && type != SSL3_RT_HANDSHAKE) ||
+           (peek && (type != SSL3_RT_APPLICATION_DATA))) {
+	{
 		SSLerr(SSL_F_DTLS1_READ_BYTES, ERR_R_INTERNAL_ERROR);
 		return -1;
 		}
diff --git a/ssl/ssl_task.c b/ssl/ssl_task.c
index b5ce44b..e8c04da 100644
--- a/ssl/ssl_task.c
+++ b/ssl/ssl_task.c
@@ -306,14 +306,14 @@ int doit(io_channel chan, SSL_CTX *s_ctx )
 		}
 	   	if ( length < RPC_HDR_SIZE ) {
 		    printf("Error in main loop get size: %d\n", length );
-       	    break;
 		    link_state = 3;
+                   break;
 		}
 	   	if ( msg.channel != 'A' ) {
 		    printf("Error in main loop, unexpected channel: %c\n", 
 			msg.channel );
-		    break;
 		    link_state = 3;
+                   break;
 		}
 		if ( msg.function == 'G' ) {
 		    link_state = 1;