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

Commit 0fae0c1e authored by Yanjiang Jin's avatar Yanjiang Jin Committed by Herbert Xu
Browse files

crypto: testmgr - fix !x==y confusion 



"if (!ret == template[i].fail)" is confusing to compilers (gcc5):

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

Let there be 'if (template[i].fail == !ret) '.

Signed-off-by: default avatarYanjiang Jin <yanjiang.jin@windriver.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent e14e7d12

crypto/testmgr.c

+5 −5
Original line number Diff line number Diff line
@@ -665,7 +665,7 @@ static int __test_aead(struct crypto_aead *tfm, int enc, 
		memcpy(key, template[i].key, template[i].klen);



		ret = crypto_aead_setkey(tfm, key, template[i].klen);

		if (!ret == template[i].fail) {

		if (template[i].fail == !ret) {

			pr_err("alg: aead%s: setkey failed on test %d for %s: flags=%x\n",

			       d, j, algo, crypto_aead_get_flags(tfm));

			goto out;
@@ -770,7 +770,7 @@ static int __test_aead(struct crypto_aead *tfm, int enc, 
		memcpy(key, template[i].key, template[i].klen);



		ret = crypto_aead_setkey(tfm, key, template[i].klen);

		if (!ret == template[i].fail) {

		if (template[i].fail == !ret) {

			pr_err("alg: aead%s: setkey failed on chunk test %d for %s: flags=%x\n",

			       d, j, algo, crypto_aead_get_flags(tfm));

			goto out;
@@ -1023,7 +1023,7 @@ static int test_cipher(struct crypto_cipher *tfm, int enc, 


		ret = crypto_cipher_setkey(tfm, template[i].key,

					   template[i].klen);

		if (!ret == template[i].fail) {

		if (template[i].fail == !ret) {

			printk(KERN_ERR "alg: cipher: setkey failed "

			       "on test %d for %s: flags=%x\n", j,

			       algo, crypto_cipher_get_flags(tfm));
@@ -1133,7 +1133,7 @@ static int __test_skcipher(struct crypto_skcipher *tfm, int enc, 


		ret = crypto_skcipher_setkey(tfm, template[i].key,

					     template[i].klen);

		if (!ret == template[i].fail) {

		if (template[i].fail == !ret) {

			pr_err("alg: skcipher%s: setkey failed on test %d for %s: flags=%x\n",

			       d, j, algo, crypto_skcipher_get_flags(tfm));

			goto out;
@@ -1211,7 +1211,7 @@ static int __test_skcipher(struct crypto_skcipher *tfm, int enc, 


		ret = crypto_skcipher_setkey(tfm, template[i].key,

					     template[i].klen);

		if (!ret == template[i].fail) {

		if (template[i].fail == !ret) {

			pr_err("alg: skcipher%s: setkey failed on chunk test %d for %s: flags=%x\n",

			       d, j, algo, crypto_skcipher_get_flags(tfm));

			goto out;