summaryrefslogtreecommitdiffstats
path: root/crypto/testmgr.h
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2015-04-28 15:36:36 +0100
committerHerbert Xu <herbert@gondor.apana.org.au>2015-05-01 11:16:37 +0800
commit09e217844a2e2d02a950bc9c129f6fe423e426e0 (patch)
tree22790e821509187160c887b82e47f65ba2f75e13 /crypto/testmgr.h
parentf94a359763c19e1d03dac61352b1041692c6a698 (diff)
downloadlinux-stable-09e217844a2e2d02a950bc9c129f6fe423e426e0.tar.gz
linux-stable-09e217844a2e2d02a950bc9c129f6fe423e426e0.tar.bz2
linux-stable-09e217844a2e2d02a950bc9c129f6fe423e426e0.zip
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: David Howells <dhowells@redhat.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto/testmgr.h')
-rw-r--r--crypto/testmgr.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/testmgr.h b/crypto/testmgr.h
index 1f5a31f23a59..1cd62a73f0f5 100644
--- a/crypto/testmgr.h
+++ b/crypto/testmgr.h
@@ -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,