Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09e21784 authored by David Howells's avatar David Howells Committed by Herbert Xu
Browse files

crypto: testmgr - Wrap the LHS in expressions of the form !x == y 



In the test manager, there are a number of if-statements with expressions of
the form !x == y that incur warnings with gcc-5 of the following form:

../crypto/testmgr.c: In function '__test_aead':
../crypto/testmgr.c:523:12: warning: logical not is only applied to the left hand side of comparison [-Wlogical-not-parentheses]
   if (!ret == template[i].fail) {
            ^

By converting the 'fail' member of struct aead_testvec and struct
cipher_testvec to a bool, we can get rid of the warnings.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent f94a3597

crypto/testmgr.h

+3 −3
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ struct cipher_testvec { 
	unsigned short tap[MAX_TAP];

	int np;

	unsigned char also_non_np;

	unsigned char fail;

	bool fail;

	unsigned char wk; /* weak key flag */

	unsigned char klen;

	unsigned short ilen;
@@ -71,7 +71,7 @@ struct aead_testvec { 
	unsigned char atap[MAX_TAP];

	int np;

	int anp;

	unsigned char fail;

	bool fail;

	unsigned char novrfy;	/* ccm dec verification failure expected */

	unsigned char wk; /* weak key flag */

	unsigned char klen;
@@ -3018,7 +3018,7 @@ static struct cipher_testvec des_enc_tv_template[] = { 
			  "\xb4\x99\x26\xf7\x1f\xe1\xd4\x90",

		.rlen	= 24,

	}, { /* Weak key */

		.fail	= 1,

		.fail	= true,

		.wk	= 1,

		.key	= "\x01\x01\x01\x01\x01\x01\x01\x01",

		.klen	= 8,