crypto: clarify name of WEAK_KEY request flag

CRYPTO_TFM_REQ_WEAK_KEY confuses newcomers to the crypto API because it
sounds like it is requesting a weak key.  Actually, it is requesting
that weak keys be forbidden (for algorithms that have the notion of
"weak keys"; currently only DES and XTS do).

Also it is only one letter away from CRYPTO_TFM_RES_WEAK_KEY, with which
it can be easily confused.  (This in fact happened in the UX500 driver,
though just in some debugging messages.)

Therefore, make the intent clear by renaming it to
CRYPTO_TFM_REQ_FORBID_WEAK_KEYS.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

1 files changed, 7 insertions, 7 deletions

diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index e4f3f5f688e7..4ac3d22256c3 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -706,7 +706,8 @@ static int __test_aead(struct crypto_aead *tfm, int enc,
 
                 crypto_aead_clear_flags(tfm, ~0);
                 if (template[i].wk)
-                        crypto_aead_set_flags(tfm, CRYPTO_TFM_REQ_WEAK_KEY);
+                        crypto_aead_set_flags(tfm,
+                                              CRYPTO_TFM_REQ_FORBID_WEAK_KEYS);
 
                 if (template[i].klen > MAX_KEYLEN) {
                         pr_err("alg: aead%s: setkey failed on test %d for %s: key size %d > %d\n",
@@ -820,7 +821,8 @@ static int __test_aead(struct crypto_aead *tfm, int enc,
 
                 crypto_aead_clear_flags(tfm, ~0);
                 if (template[i].wk)
-                        crypto_aead_set_flags(tfm, CRYPTO_TFM_REQ_WEAK_KEY);
+                        crypto_aead_set_flags(tfm,
+                                              CRYPTO_TFM_REQ_FORBID_WEAK_KEYS);
                 if (template[i].klen > MAX_KEYLEN) {
                         pr_err("alg: aead%s: setkey failed on test %d for %s: key size %d > %d\n",
                                d, j, algo, template[i].klen, MAX_KEYLEN);
@@ -1078,7 +1080,7 @@ static int test_cipher(struct crypto_cipher *tfm, int enc,
 
                 crypto_cipher_clear_flags(tfm, ~0);
                 if (template[i].wk)
-                        crypto_cipher_set_flags(tfm, CRYPTO_TFM_REQ_WEAK_KEY);
+                        crypto_cipher_set_flags(tfm, CRYPTO_TFM_REQ_FORBID_WEAK_KEYS);
 
                 ret = crypto_cipher_setkey(tfm, template[i].key,
                                            template[i].klen);
@@ -1194,8 +1196,7 @@ static int __test_skcipher(struct crypto_skcipher *tfm, int enc,
 
                 crypto_skcipher_clear_flags(tfm, ~0);
                 if (template[i].wk)
-                        crypto_skcipher_set_flags(tfm,
-                                                  CRYPTO_TFM_REQ_WEAK_KEY);
+                        crypto_skcipher_set_flags(tfm, CRYPTO_TFM_REQ_FORBID_WEAK_KEYS);
 
                 ret = crypto_skcipher_setkey(tfm, template[i].key,
                                              template[i].klen);
@@ -1265,8 +1266,7 @@ static int __test_skcipher(struct crypto_skcipher *tfm, int enc,
                 j++;
                 crypto_skcipher_clear_flags(tfm, ~0);
                 if (template[i].wk)
-                        crypto_skcipher_set_flags(tfm,
-                                                  CRYPTO_TFM_REQ_WEAK_KEY);
+                        crypto_skcipher_set_flags(tfm, CRYPTO_TFM_REQ_FORBID_WEAK_KEYS);
 
                 ret = crypto_skcipher_setkey(tfm, template[i].key,
                                              template[i].klen);