From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
To: linux-crypto@vger.kernel.org
Cc: herbert@gondor.apana.org.au, ebiggers@kernel.org,
Ard Biesheuvel <ard.biesheuvel@linaro.org>
Subject: [PATCH v3 01/32] crypto: arm/aes-ce - cosmetic/whitespace cleanup
Date: Thu, 27 Jun 2019 12:26:16 +0200 [thread overview]
Message-ID: <20190627102647.2992-2-ard.biesheuvel@linaro.org> (raw)
In-Reply-To: <20190627102647.2992-1-ard.biesheuvel@linaro.org>
Rearrange the aes_algs[] array for legibility.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
arch/arm/crypto/aes-ce-glue.c | 116 ++++++++++----------
1 file changed, 56 insertions(+), 60 deletions(-)
diff --git a/arch/arm/crypto/aes-ce-glue.c b/arch/arm/crypto/aes-ce-glue.c
index 5affb8482379..04ba66903674 100644
--- a/arch/arm/crypto/aes-ce-glue.c
+++ b/arch/arm/crypto/aes-ce-glue.c
@@ -337,69 +337,65 @@ static int xts_decrypt(struct skcipher_request *req)
}
static struct skcipher_alg aes_algs[] = { {
- .base = {
- .cra_name = "__ecb(aes)",
- .cra_driver_name = "__ecb-aes-ce",
- .cra_priority = 300,
- .cra_flags = CRYPTO_ALG_INTERNAL,
- .cra_blocksize = AES_BLOCK_SIZE,
- .cra_ctxsize = sizeof(struct crypto_aes_ctx),
- .cra_module = THIS_MODULE,
- },
- .min_keysize = AES_MIN_KEY_SIZE,
- .max_keysize = AES_MAX_KEY_SIZE,
- .setkey = ce_aes_setkey,
- .encrypt = ecb_encrypt,
- .decrypt = ecb_decrypt,
+ .base.cra_name = "__ecb(aes)",
+ .base.cra_driver_name = "__ecb-aes-ce",
+ .base.cra_priority = 300,
+ .base.cra_flags = CRYPTO_ALG_INTERNAL,
+ .base.cra_blocksize = AES_BLOCK_SIZE,
+ .base.cra_ctxsize = sizeof(struct crypto_aes_ctx),
+ .base.cra_module = THIS_MODULE,
+
+ .min_keysize = AES_MIN_KEY_SIZE,
+ .max_keysize = AES_MAX_KEY_SIZE,
+ .setkey = ce_aes_setkey,
+ .encrypt = ecb_encrypt,
+ .decrypt = ecb_decrypt,
}, {
- .base = {
- .cra_name = "__cbc(aes)",
- .cra_driver_name = "__cbc-aes-ce",
- .cra_priority = 300,
- .cra_flags = CRYPTO_ALG_INTERNAL,
- .cra_blocksize = AES_BLOCK_SIZE,
- .cra_ctxsize = sizeof(struct crypto_aes_ctx),
- .cra_module = THIS_MODULE,
- },
- .min_keysize = AES_MIN_KEY_SIZE,
- .max_keysize = AES_MAX_KEY_SIZE,
- .ivsize = AES_BLOCK_SIZE,
- .setkey = ce_aes_setkey,
- .encrypt = cbc_encrypt,
- .decrypt = cbc_decrypt,
+ .base.cra_name = "__cbc(aes)",
+ .base.cra_driver_name = "__cbc-aes-ce",
+ .base.cra_priority = 300,
+ .base.cra_flags = CRYPTO_ALG_INTERNAL,
+ .base.cra_blocksize = AES_BLOCK_SIZE,
+ .base.cra_ctxsize = sizeof(struct crypto_aes_ctx),
+ .base.cra_module = THIS_MODULE,
+
+ .min_keysize = AES_MIN_KEY_SIZE,
+ .max_keysize = AES_MAX_KEY_SIZE,
+ .ivsize = AES_BLOCK_SIZE,
+ .setkey = ce_aes_setkey,
+ .encrypt = cbc_encrypt,
+ .decrypt = cbc_decrypt,
}, {
- .base = {
- .cra_name = "__ctr(aes)",
- .cra_driver_name = "__ctr-aes-ce",
- .cra_priority = 300,
- .cra_flags = CRYPTO_ALG_INTERNAL,
- .cra_blocksize = 1,
- .cra_ctxsize = sizeof(struct crypto_aes_ctx),
- .cra_module = THIS_MODULE,
- },
- .min_keysize = AES_MIN_KEY_SIZE,
- .max_keysize = AES_MAX_KEY_SIZE,
- .ivsize = AES_BLOCK_SIZE,
- .chunksize = AES_BLOCK_SIZE,
- .setkey = ce_aes_setkey,
- .encrypt = ctr_encrypt,
- .decrypt = ctr_encrypt,
+ .base.cra_name = "__ctr(aes)",
+ .base.cra_driver_name = "__ctr-aes-ce",
+ .base.cra_priority = 300,
+ .base.cra_flags = CRYPTO_ALG_INTERNAL,
+ .base.cra_blocksize = 1,
+ .base.cra_ctxsize = sizeof(struct crypto_aes_ctx),
+ .base.cra_module = THIS_MODULE,
+
+ .min_keysize = AES_MIN_KEY_SIZE,
+ .max_keysize = AES_MAX_KEY_SIZE,
+ .ivsize = AES_BLOCK_SIZE,
+ .chunksize = AES_BLOCK_SIZE,
+ .setkey = ce_aes_setkey,
+ .encrypt = ctr_encrypt,
+ .decrypt = ctr_encrypt,
}, {
- .base = {
- .cra_name = "__xts(aes)",
- .cra_driver_name = "__xts-aes-ce",
- .cra_priority = 300,
- .cra_flags = CRYPTO_ALG_INTERNAL,
- .cra_blocksize = AES_BLOCK_SIZE,
- .cra_ctxsize = sizeof(struct crypto_aes_xts_ctx),
- .cra_module = THIS_MODULE,
- },
- .min_keysize = 2 * AES_MIN_KEY_SIZE,
- .max_keysize = 2 * AES_MAX_KEY_SIZE,
- .ivsize = AES_BLOCK_SIZE,
- .setkey = xts_set_key,
- .encrypt = xts_encrypt,
- .decrypt = xts_decrypt,
+ .base.cra_name = "__xts(aes)",
+ .base.cra_driver_name = "__xts-aes-ce",
+ .base.cra_priority = 300,
+ .base.cra_flags = CRYPTO_ALG_INTERNAL,
+ .base.cra_blocksize = AES_BLOCK_SIZE,
+ .base.cra_ctxsize = sizeof(struct crypto_aes_xts_ctx),
+ .base.cra_module = THIS_MODULE,
+
+ .min_keysize = 2 * AES_MIN_KEY_SIZE,
+ .max_keysize = 2 * AES_MAX_KEY_SIZE,
+ .ivsize = AES_BLOCK_SIZE,
+ .setkey = xts_set_key,
+ .encrypt = xts_encrypt,
+ .decrypt = xts_decrypt,
} };
static struct simd_skcipher_alg *aes_simd_algs[ARRAY_SIZE(aes_algs)];
--
2.20.1
next prev parent reply other threads:[~2019-06-27 10:27 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-27 10:26 [PATCH v3 00/32] crypto: AES cleanup Ard Biesheuvel
2019-06-27 10:26 ` Ard Biesheuvel [this message]
2019-06-27 10:26 ` [PATCH v3 02/32] crypto: aes - rename local routines to prevent future clashes Ard Biesheuvel
2019-06-27 10:26 ` [PATCH v3 03/32] crypto: aes/fixed-time - align key schedule with other implementations Ard Biesheuvel
2019-06-27 10:26 ` [PATCH v3 04/32] crypto: aes - create AES library based on the fixed time AES code Ard Biesheuvel
2019-06-27 10:26 ` [PATCH v3 05/32] crypto: x86/aes-ni - switch to generic for fallback and key routines Ard Biesheuvel
2019-06-27 10:26 ` [PATCH v3 06/32] crypto: x86/aes - drop scalar assembler implementations Ard Biesheuvel
2019-06-27 10:26 ` [PATCH v3 07/32] crypto: padlock/aes - switch to library version of key expansion routine Ard Biesheuvel
2019-06-27 10:26 ` [PATCH v3 08/32] crypto: cesa/aes " Ard Biesheuvel
2019-06-27 10:26 ` [PATCH v3 09/32] crypto: safexcel/aes " Ard Biesheuvel
2019-06-27 10:26 ` [PATCH v3 10/32] crypto: arm64/ghash - switch to AES library Ard Biesheuvel
2019-06-27 10:26 ` [PATCH v3 11/32] crypto: arm/aes-neonbs - switch to library version of key expansion routine Ard Biesheuvel
2019-06-27 10:26 ` [PATCH v3 12/32] crypto: arm64/aes-ccm - switch to AES library Ard Biesheuvel
2019-06-27 10:26 ` [PATCH v3 13/32] crypto: arm64/aes-neonbs - switch to library version of key expansion routine Ard Biesheuvel
2019-06-27 10:26 ` [PATCH v3 14/32] crypto: arm64/aes-ce " Ard Biesheuvel
2019-06-27 10:26 ` [PATCH v3 15/32] crypto: generic/aes - drop key expansion routine in favor of library version Ard Biesheuvel
2019-06-27 10:26 ` [PATCH v3 16/32] crypto: ctr - add helper for performing a CTR encryption walk Ard Biesheuvel
2019-06-27 10:26 ` [PATCH v3 17/32] crypto: aes - move sync ctr(aes) to AES library and generic helper Ard Biesheuvel
2019-06-27 10:26 ` [PATCH v3 18/32] crypto: arm64/aes-ce-cipher - use AES library as fallback Ard Biesheuvel
2019-06-27 10:26 ` [PATCH v3 19/32] crypto: aes/arm - use native endiannes for key schedule Ard Biesheuvel
2019-06-27 10:26 ` [PATCH v3 20/32] crypto: arm/aes-ce - provide a synchronous version of ctr(aes) Ard Biesheuvel
2019-06-27 10:26 ` [PATCH v3 21/32] crypto: arm/aes-neonbs " Ard Biesheuvel
2019-06-27 10:26 ` [PATCH v3 22/32] crypto: arm/ghash - provide a synchronous version Ard Biesheuvel
2019-06-27 10:26 ` [PATCH v3 23/32] bluetooth: switch to AES library Ard Biesheuvel
2019-06-27 10:26 ` [PATCH v3 24/32] crypto: amcc/aes - switch to AES library for GCM key derivation Ard Biesheuvel
2019-06-27 10:26 ` [PATCH v3 25/32] crypto: ccp - move to AES library for CMAC " Ard Biesheuvel
2019-06-27 10:26 ` [PATCH v3 26/32] crypto: chelsio/aes - replace AES cipher calls with library calls Ard Biesheuvel
2019-06-27 10:26 ` [PATCH v3 27/32] crypto: aes/generic - unexport last-round AES tables Ard Biesheuvel
2019-06-27 10:26 ` [PATCH v3 28/32] crypto: lib/aes - export sbox and inverse sbox Ard Biesheuvel
2019-06-27 17:52 ` Eric Biggers
2019-06-28 9:45 ` Ard Biesheuvel
2019-06-27 10:26 ` [PATCH v3 29/32] crypto: arm64/aes-neon - switch to shared AES Sboxes Ard Biesheuvel
2019-06-27 10:26 ` [PATCH v3 30/32] crypto: arm/aes-cipher - switch to shared AES inverse Sbox Ard Biesheuvel
2019-06-27 10:26 ` [PATCH v3 31/32] crypto: arm64/aes-cipher " Ard Biesheuvel
2019-06-27 10:26 ` [PATCH v3 32/32] crypto: arm/aes-scalar - unexport en/decryption routines Ard Biesheuvel
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=20190627102647.2992-2-ard.biesheuvel@linaro.org \
--to=ard.biesheuvel@linaro.org \
--cc=ebiggers@kernel.org \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@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