[PATCH v2 08/20] crypto: mark AES-NI Camellia helper ciphers

2015-03-27 Thread Stephan Mueller 
Flag all AES-NI Camellia helper ciphers as internal ciphers to
prevent them from being called by normal users.

Signed-off-by: Stephan Mueller 
---
 arch/x86/crypto/camellia_aesni_avx2_glue.c | 15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/arch/x86/crypto/camellia_aesni_avx2_glue.c 
b/arch/x86/crypto/camellia_aesni_avx2_glue.c
index 9a07faf..baf0ac2 100644
--- 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,
-- 
2.1.0


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v2 08/20] crypto: mark AES-NI Camellia helper ciphers

2015-03-27 Thread Stephan Mueller 
Flag all AES-NI Camellia helper ciphers as internal ciphers to
prevent them from being called by normal users.

Signed-off-by: Stephan Mueller smuel...@chronox.de
---
 arch/x86/crypto/camellia_aesni_avx2_glue.c | 15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/arch/x86/crypto/camellia_aesni_avx2_glue.c 
b/arch/x86/crypto/camellia_aesni_avx2_glue.c
index 9a07faf..baf0ac2 100644
--- 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,
-- 
2.1.0


--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/