Commit 293614ce authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Herbert Xu
Browse files

crypto: arm64/aes-blk - expose AES-CTR as synchronous cipher as well 



In addition to wrapping the AES-CTR cipher into the async SIMD wrapper,
which exposes it as an async skcipher that defers processing to process
context, expose our AES-CTR implementation directly as a synchronous cipher
as well, but with a lower priority.

This makes the AES-CTR transform usable in places where synchronous
transforms are required, such as the MAC802.11 encryption code, which
executes in sotfirq context, where SIMD processing is allowed on arm64.
Users of the async transform will keep the existing behavior.

Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent afaf712e

arch/arm64/crypto/aes-glue.c

+23 −2
Original line number Diff line number Diff line
@@ -325,6 +325,23 @@ static struct skcipher_alg aes_algs[] = { { 
	.setkey		= skcipher_aes_setkey,

	.encrypt	= ctr_encrypt,

	.decrypt	= ctr_encrypt,

}, {

	.base = {

		.cra_name		= "ctr(aes)",

		.cra_driver_name	= "ctr-aes-" MODE,

		.cra_priority		= PRIO - 1,

		.cra_blocksize		= 1,

		.cra_ctxsize		= sizeof(struct crypto_aes_ctx),

		.cra_alignmask		= 7,

		.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		= skcipher_aes_setkey,

	.encrypt	= ctr_encrypt,

	.decrypt	= ctr_encrypt,

}, {

	.base = {

		.cra_name		= "__xts(aes)",
@@ -350,7 +367,8 @@ static void aes_exit(void) 
{

	int i;



	for (i = 0; i < ARRAY_SIZE(aes_simd_algs) && aes_simd_algs[i]; i++)

	for (i = 0; i < ARRAY_SIZE(aes_simd_algs); i++)

		if (aes_simd_algs[i])

			simd_skcipher_free(aes_simd_algs[i]);



	crypto_unregister_skciphers(aes_algs, ARRAY_SIZE(aes_algs));
@@ -370,6 +388,9 @@ static int __init aes_init(void) 
		return err;



	for (i = 0; i < ARRAY_SIZE(aes_algs); i++) {

		if (!(aes_algs[i].base.cra_flags & CRYPTO_ALG_INTERNAL))

			continue;



		algname = aes_algs[i].base.cra_name + 2;

		drvname = aes_algs[i].base.cra_driver_name + 2;

		basename = aes_algs[i].base.cra_driver_name;

CRA Git | Maintained and supported by SUSTech CRA and CCSE