Merge tag 'microblaze-v5.6-rc1' of git://git.monstr.eu/linux-2.6-microblaze

[linux-2.6-microblaze.git] / include / crypto / xts.h

diff --git a/include/crypto/xts.h b/include/crypto/xts.h
index 75fd96f..0f8dba6 100644 (file)
--- a/include/crypto/xts.h
+++ b/include/crypto/xts.h
@@ -8,28 +8,19 @@
 
 #define XTS_BLOCK_SIZE 16
 
-#define XTS_TWEAK_CAST(x) ((void (*)(void *, u8*, const u8*))(x))
-
 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.
         */
-       if (keylen % 2) {
-               *flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
+       if (keylen % 2)
                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;
 }
@@ -41,18 +32,14 @@ static inline int xts_verify_key(struct crypto_skcipher *tfm,
         * key consists of keys of equal size concatenated, therefore
         * the length must be even.
         */
-       if (keylen % 2) {
-               crypto_skcipher_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);
+       if (keylen % 2)
                return -EINVAL;
-       }
 
        /* 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;
 }