Merge tag 'v3.10.55' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / arm / crypto / aes_glue.c

diff --git a/arch/arm/crypto/aes_glue.c b/arch/arm/crypto/aes_glue.c
index 59f7877ead6ac9ee3f8a31b43c6e0458de26cd8f..d6a15f5583237d1aa6b575374ec9f0f6b36ed6d4 100644 (file)
--- a/arch/arm/crypto/aes_glue.c
+++ b/arch/arm/crypto/aes_glue.c
@@ -59,8 +59,10 @@ static int aes_set_key(struct crypto_tfm *tfm, const u8 *in_key,
                tfm->crt_flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
                return -EINVAL;
        }
+       #ifndef CONFIG_CRYPTO_AES_ARM32_CE
        /* private_AES_set_decrypt_key expects an encryption key as input */
        ctx->dec_key = ctx->enc_key;
+       #endif
        if (private_AES_set_decrypt_key(in_key, key_len, &ctx->dec_key) == -1) {
                tfm->crt_flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
                return -EINVAL;