projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4b3f4e3)
crypto: camellia_aesni_avx2 - mark AES-NI Camellia helper ciphers
authorStephan Mueller <smueller@chronox.de>
Mon, 30 Mar 2015 20:03:17 +0000 (22:03 +0200)
committerHerbert Xu <herbert@gondor.apana.org.au>
Tue, 31 Mar 2015 13:21:07 +0000 (21:21 +0800)
Flag all AES-NI Camellia helper ciphers as internal ciphers to
prevent them from being called by normal users.

Signed-off-by: Stephan Mueller <smueller@chronox.de>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
arch/x86/crypto/camellia_aesni_avx2_glue.c patch | blob | blame | history

diff --git a/arch/x86/crypto/camellia_aesni_avx2_glue.c b/arch/x86/crypto/camellia_aesni_avx2_glue.c
index 9a07fafe3831394c86da42758d3a1407628f03ab..baf0ac21ace5664835ed9435207ddabc3dc0cc7a 100644 (file)
--- a/arch/x86/crypto/camellia_aesni_avx2_glue.c
+++ b/arch/x86/crypto/camellia_aesni_avx2_glue.c
@@ -343,7 +343,8 @@ static struct crypto_alg cmll_algs[10] = { {
        .cra_name               = "__ecb-camellia-aesni-avx2",
        .cra_driver_name        = "__driver-ecb-camellia-aesni-avx2",
        .cra_priority           = 0,
-       .cra_flags              = CRYPTO_ALG_TYPE_BLKCIPHER,
+       .cra_flags              = CRYPTO_ALG_TYPE_BLKCIPHER |
+                                 CRYPTO_ALG_INTERNAL,
        .cra_blocksize          = CAMELLIA_BLOCK_SIZE,
        .cra_ctxsize            = sizeof(struct camellia_ctx),
        .cra_alignmask          = 0,
@@ -362,7 +363,8 @@ static struct crypto_alg cmll_algs[10] = { {
        .cra_name               = "__cbc-camellia-aesni-avx2",
        .cra_driver_name        = "__driver-cbc-camellia-aesni-avx2",
        .cra_priority           = 0,
-       .cra_flags              = CRYPTO_ALG_TYPE_BLKCIPHER,
+       .cra_flags              = CRYPTO_ALG_TYPE_BLKCIPHER |
+                                 CRYPTO_ALG_INTERNAL,
        .cra_blocksize          = CAMELLIA_BLOCK_SIZE,
        .cra_ctxsize            = sizeof(struct camellia_ctx),
        .cra_alignmask          = 0,
@@ -381,7 +383,8 @@ static struct crypto_alg cmll_algs[10] = { {
        .cra_name               = "__ctr-camellia-aesni-avx2",
        .cra_driver_name        = "__driver-ctr-camellia-aesni-avx2",
        .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 camellia_ctx),
        .cra_alignmask          = 0,
@@ -401,7 +404,8 @@ static struct crypto_alg cmll_algs[10] = { {
        .cra_name               = "__lrw-camellia-aesni-avx2",
        .cra_driver_name        = "__driver-lrw-camellia-aesni-avx2",
        .cra_priority           = 0,
-       .cra_flags              = CRYPTO_ALG_TYPE_BLKCIPHER,
+       .cra_flags              = CRYPTO_ALG_TYPE_BLKCIPHER |
+                                 CRYPTO_ALG_INTERNAL,
        .cra_blocksize          = CAMELLIA_BLOCK_SIZE,
        .cra_ctxsize            = sizeof(struct camellia_lrw_ctx),
        .cra_alignmask          = 0,
@@ -424,7 +428,8 @@ static struct crypto_alg cmll_algs[10] = { {
        .cra_name               = "__xts-camellia-aesni-avx2",
        .cra_driver_name        = "__driver-xts-camellia-aesni-avx2",
        .cra_priority           = 0,
-       .cra_flags              = CRYPTO_ALG_TYPE_BLKCIPHER,
+       .cra_flags              = CRYPTO_ALG_TYPE_BLKCIPHER |
+                                 CRYPTO_ALG_INTERNAL,
        .cra_blocksize          = CAMELLIA_BLOCK_SIZE,
        .cra_ctxsize            = sizeof(struct camellia_xts_ctx),
        .cra_alignmask          = 0,