Merge tag 'v4.4-rc2'

[firefly-linux-kernel-4.4.55.git] / arch / arm64 / crypto / aes-glue.c

diff --git a/arch/arm64/crypto/aes-glue.c b/arch/arm64/crypto/aes-glue.c
index 801aae32841f2513ba665034ae4817945debb781..05d9e16c0dfdd81a8a6ffe141e5c6f5cc96b3e7e 100644 (file)
--- a/arch/arm64/crypto/aes-glue.c
+++ b/arch/arm64/crypto/aes-glue.c
@@ -44,10 +44,10 @@ MODULE_DESCRIPTION("AES-ECB/CBC/CTR/XTS using ARMv8 Crypto Extensions");
 #define aes_xts_encrypt                neon_aes_xts_encrypt
 #define aes_xts_decrypt                neon_aes_xts_decrypt
 MODULE_DESCRIPTION("AES-ECB/CBC/CTR/XTS using ARMv8 NEON");
-MODULE_ALIAS("ecb(aes)");
-MODULE_ALIAS("cbc(aes)");
-MODULE_ALIAS("ctr(aes)");
-MODULE_ALIAS("xts(aes)");
+MODULE_ALIAS_CRYPTO("ecb(aes)");
+MODULE_ALIAS_CRYPTO("cbc(aes)");
+MODULE_ALIAS_CRYPTO("ctr(aes)");
+MODULE_ALIAS_CRYPTO("xts(aes)");
 #endif
 
 MODULE_AUTHOR("Ard Biesheuvel <ard.biesheuvel@linaro.org>");
@@ -284,7 +284,8 @@ static struct crypto_alg aes_algs[] = { {
        .cra_name               = "__ecb-aes-" MODE,
        .cra_driver_name        = "__driver-ecb-aes-" MODE,
        .cra_priority           = 0,
-       .cra_flags              = CRYPTO_ALG_TYPE_BLKCIPHER,
+       .cra_flags              = CRYPTO_ALG_TYPE_BLKCIPHER |
+                                 CRYPTO_ALG_INTERNAL,
        .cra_blocksize          = AES_BLOCK_SIZE,
        .cra_ctxsize            = sizeof(struct crypto_aes_ctx),
        .cra_alignmask          = 7,
@@ -302,7 +303,8 @@ static struct crypto_alg aes_algs[] = { {
        .cra_name               = "__cbc-aes-" MODE,
        .cra_driver_name        = "__driver-cbc-aes-" MODE,
        .cra_priority           = 0,
-       .cra_flags              = CRYPTO_ALG_TYPE_BLKCIPHER,
+       .cra_flags              = CRYPTO_ALG_TYPE_BLKCIPHER |
+                                 CRYPTO_ALG_INTERNAL,
        .cra_blocksize          = AES_BLOCK_SIZE,
        .cra_ctxsize            = sizeof(struct crypto_aes_ctx),
        .cra_alignmask          = 7,
@@ -320,7 +322,8 @@ static struct crypto_alg aes_algs[] = { {
        .cra_name               = "__ctr-aes-" MODE,
        .cra_driver_name        = "__driver-ctr-aes-" MODE,
        .cra_priority           = 0,
-       .cra_flags              = CRYPTO_ALG_TYPE_BLKCIPHER,
+       .cra_flags              = CRYPTO_ALG_TYPE_BLKCIPHER |
+                                 CRYPTO_ALG_INTERNAL,
        .cra_blocksize          = 1,
        .cra_ctxsize            = sizeof(struct crypto_aes_ctx),
        .cra_alignmask          = 7,
@@ -338,7 +341,8 @@ static struct crypto_alg aes_algs[] = { {
        .cra_name               = "__xts-aes-" MODE,
        .cra_driver_name        = "__driver-xts-aes-" MODE,
        .cra_priority           = 0,
-       .cra_flags              = CRYPTO_ALG_TYPE_BLKCIPHER,
+       .cra_flags              = CRYPTO_ALG_TYPE_BLKCIPHER |
+                                 CRYPTO_ALG_INTERNAL,
        .cra_blocksize          = AES_BLOCK_SIZE,
        .cra_ctxsize            = sizeof(struct crypto_aes_xts_ctx),
        .cra_alignmask          = 7,