From: Stephan Mueller <smueller@chronox.de>
To: "'Herbert Xu" <herbert@gondor.apana.org.au>
Cc: linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 10/20] crypto: mark AVX Camellia helper ciphers
Date: Fri, 27 Mar 2015 23:55:46 +0100 [thread overview]
Message-ID: <8207778.IEiPM1ext1@tachyon.chronox.de> (raw)
In-Reply-To: <1746748.uPZFXamDiM@tachyon.chronox.de>
Flag all AVX Camellia helper ciphers as internal ciphers to prevent
them from being called by normal users.
Signed-off-by: Stephan Mueller <smueller@chronox.de>
---
arch/x86/crypto/camellia_aesni_avx_glue.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/arch/x86/crypto/camellia_aesni_avx_glue.c b/arch/x86/crypto/camellia_aesni_avx_glue.c
index ed38d95..78818a1 100644
--- a/arch/x86/crypto/camellia_aesni_avx_glue.c
+++ b/arch/x86/crypto/camellia_aesni_avx_glue.c
@@ -335,7 +335,8 @@ static struct crypto_alg cmll_algs[10] = { {
.cra_name = "__ecb-camellia-aesni",
.cra_driver_name = "__driver-ecb-camellia-aesni",
.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,
@@ -354,7 +355,8 @@ static struct crypto_alg cmll_algs[10] = { {
.cra_name = "__cbc-camellia-aesni",
.cra_driver_name = "__driver-cbc-camellia-aesni",
.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,
@@ -373,7 +375,8 @@ static struct crypto_alg cmll_algs[10] = { {
.cra_name = "__ctr-camellia-aesni",
.cra_driver_name = "__driver-ctr-camellia-aesni",
.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,
@@ -393,7 +396,8 @@ static struct crypto_alg cmll_algs[10] = { {
.cra_name = "__lrw-camellia-aesni",
.cra_driver_name = "__driver-lrw-camellia-aesni",
.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,
@@ -416,7 +420,8 @@ static struct crypto_alg cmll_algs[10] = { {
.cra_name = "__xts-camellia-aesni",
.cra_driver_name = "__driver-xts-camellia-aesni",
.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
next prev parent reply other threads:[~2015-03-27 23:09 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-27 22:49 [PATCH v2 00/20] crypto: restrict usage of " Stephan Mueller
2015-03-27 22:49 ` [PATCH v2 01/20] crypto: prevent helper ciphers from being used Stephan Mueller
2015-03-27 22:50 ` [PATCH v2 02/20] crypto: testmgr to use CRYPTO_ALG_INTERNAL Stephan Mueller
2015-03-30 13:10 ` Herbert Xu
2015-03-30 19:31 ` Stephan Mueller
2015-03-27 22:51 ` [PATCH v2 03/20] crypto: cryptd to process CRYPTO_ALG_INTERNAL Stephan Mueller
2015-03-27 22:52 ` [PATCH v2 04/20] crypto: /proc/crypto: identify internal ciphers Stephan Mueller
2015-03-27 22:52 ` [PATCH v2 05/20] crypto: mark AES-NI helper ciphers Stephan Mueller
2015-03-27 22:53 ` [PATCH v2 06/20] crypto: mark ghash clmulni " Stephan Mueller
2015-03-27 22:54 ` [PATCH v2 07/20] crypto: mark GHASH ARMv8 vmull.p64 " Stephan Mueller
2015-03-27 22:54 ` [PATCH v2 08/20] crypto: mark AES-NI Camellia " Stephan Mueller
2015-03-27 22:55 ` [PATCH v2 09/20] crypto: mark CAST5 " Stephan Mueller
2015-03-27 22:55 ` Stephan Mueller [this message]
2015-03-27 22:56 ` [PATCH v2 11/20] crypto: mark CAST6 " Stephan Mueller
2015-03-27 22:56 ` [PATCH v2 12/20] crypto: mark Serpent AVX2 " Stephan Mueller
2015-03-27 22:57 ` [PATCH v2 13/20] crypto: mark Serpent AVX " Stephan Mueller
2015-03-27 22:57 ` [PATCH v2 14/20] crypto: mark Serpent SSE2 " Stephan Mueller
2015-03-27 22:58 ` [PATCH v2 15/20] crypto: mark Twofish AVX " Stephan Mueller
2015-03-27 22:59 ` [PATCH v2 16/20] crypto: mark NEON bit sliced AES " Stephan Mueller
2015-03-27 23:00 ` [PATCH v2 17/20] crypto: mark ARMv8 " Stephan Mueller
2015-03-27 23:00 ` [PATCH v2 18/20] crypto: mark 64 bit " Stephan Mueller
2015-03-27 23:01 ` [PATCH v2 19/20] crypto: mcryptd to process CRYPTO_ALG_INTERNAL Stephan Mueller
2015-03-27 23:02 ` [PATCH v2 20/20] crypto: mark Multi buffer SHA1 helper cipher Stephan Mueller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8207778.IEiPM1ext1@tachyon.chronox.de \
--to=smueller@chronox.de \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome