crypto: remove CRYPTO_TFM_RES_WEAK_KEY

[tomoyo/tomoyo-test1.git] / include / crypto / xts.h

diff --git a/include/crypto/xts.h b/include/crypto/xts.h
index 57b2c52..0f8dba6 100644 (file)
--- a/include/crypto/xts.h
+++ b/include/crypto/xts.h
@@ -11,8 +11,6 @@
 static inline int xts_check_key(struct crypto_tfm *tfm,
                                const u8 *key, unsigned int keylen)
 {
-       u32 *flags = &tfm->crt_flags;
-
        /*
         * key consists of keys of equal size concatenated, therefore
         * the length must be even.
@@ -21,11 +19,8 @@ static inline int xts_check_key(struct crypto_tfm *tfm,
                return -EINVAL;
 
        /* ensure that the AES and tweak key are not identical */
-       if (fips_enabled &&
-           !crypto_memneq(key, key + (keylen / 2), keylen / 2)) {
-               *flags |= CRYPTO_TFM_RES_WEAK_KEY;
+       if (fips_enabled && !crypto_memneq(key, key + (keylen / 2), keylen / 2))
                return -EINVAL;
-       }
 
        return 0;
 }
@@ -43,10 +38,8 @@ static inline int xts_verify_key(struct crypto_skcipher *tfm,
        /* ensure that the AES and tweak key are not identical */
        if ((fips_enabled || (crypto_skcipher_get_flags(tfm) &
                              CRYPTO_TFM_REQ_FORBID_WEAK_KEYS)) &&
-           !crypto_memneq(key, key + (keylen / 2), keylen / 2)) {
-               crypto_skcipher_set_flags(tfm, CRYPTO_TFM_RES_WEAK_KEY);
+           !crypto_memneq(key, key + (keylen / 2), keylen / 2))
                return -EINVAL;
-       }
 
        return 0;
 }