crypto: aes - rename local routines to prevent future clashes

[linux-block.git] / arch / arm64 / crypto / aes-cipher-glue.c

diff --git a/arch/arm64/crypto/aes-cipher-glue.c b/arch/arm64/crypto/aes-cipher-glue.c
index 0913966aa6fa56e2bfcd7f54cf87fa2d73585029..cc7a6dad7c2e410f1e954f4029f10dae660b2b18 100644 (file)
--- a/arch/arm64/crypto/aes-cipher-glue.c
+++ b/arch/arm64/crypto/aes-cipher-glue.c
@@ -15,7 +15,7 @@ EXPORT_SYMBOL(__aes_arm64_encrypt);
 asmlinkage void __aes_arm64_decrypt(u32 *rk, u8 *out, const u8 *in, int rounds);
 EXPORT_SYMBOL(__aes_arm64_decrypt);
 
-static void aes_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)
+static void aes_arm64_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)
 {
        struct crypto_aes_ctx *ctx = crypto_tfm_ctx(tfm);
        int rounds = 6 + ctx->key_length / 4;
@@ -23,7 +23,7 @@ static void aes_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)
        __aes_arm64_encrypt(ctx->key_enc, out, in, rounds);
 }
 
-static void aes_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)
+static void aes_arm64_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)
 {
        struct crypto_aes_ctx *ctx = crypto_tfm_ctx(tfm);
        int rounds = 6 + ctx->key_length / 4;
@@ -43,8 +43,8 @@ static struct crypto_alg aes_alg = {
        .cra_cipher.cia_min_keysize     = AES_MIN_KEY_SIZE,
        .cra_cipher.cia_max_keysize     = AES_MAX_KEY_SIZE,
        .cra_cipher.cia_setkey          = crypto_aes_set_key,
-       .cra_cipher.cia_encrypt         = aes_encrypt,
-       .cra_cipher.cia_decrypt         = aes_decrypt
+       .cra_cipher.cia_encrypt         = aes_arm64_encrypt,
+       .cra_cipher.cia_decrypt         = aes_arm64_decrypt
 };
 
 static int __init aes_init(void)