Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bee038a4 authored Feb 12, 2016 by Jeremy Linton Committed by Will Deacon Feb 15, 2016

arm/arm64: crypto: assure that ECB modes don't require an IV



ECB modes don't use an initialization vector. The kernel
/proc/crypto interface doesn't reflect this properly.

Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>

parent a80a0eb7

arch/arm/crypto/aes-ce-glue.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -364,7 +364,7 @@ static struct crypto_alg aes_algs[] = { {
		.cra_blkcipher = {
		.min_keysize = AES_MIN_KEY_SIZE,
		.max_keysize = AES_MAX_KEY_SIZE,
		.ivsize = AES_BLOCK_SIZE,
		.ivsize = 0,
		.setkey = ce_aes_setkey,
		.encrypt = ecb_encrypt,
		.decrypt = ecb_decrypt,
		@@ -441,7 +441,7 @@ static struct crypto_alg aes_algs[] = { {
		.cra_ablkcipher = {
		.min_keysize = AES_MIN_KEY_SIZE,
		.max_keysize = AES_MAX_KEY_SIZE,
		.ivsize = AES_BLOCK_SIZE,
		.ivsize = 0,
		.setkey = ablk_set_key,
		.encrypt = ablk_encrypt,
		.decrypt = ablk_decrypt,

arch/arm64/crypto/aes-glue.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -294,7 +294,7 @@ static struct crypto_alg aes_algs[] = { {
		.cra_blkcipher = {
		.min_keysize = AES_MIN_KEY_SIZE,
		.max_keysize = AES_MAX_KEY_SIZE,
		.ivsize = AES_BLOCK_SIZE,
		.ivsize = 0,
		.setkey = aes_setkey,
		.encrypt = ecb_encrypt,
		.decrypt = ecb_decrypt,
		@@ -371,7 +371,7 @@ static struct crypto_alg aes_algs[] = { {
		.cra_ablkcipher = {
		.min_keysize = AES_MIN_KEY_SIZE,
		.max_keysize = AES_MAX_KEY_SIZE,
		.ivsize = AES_BLOCK_SIZE,
		.ivsize = 0,
		.setkey = ablk_set_key,
		.encrypt = ablk_encrypt,
		.decrypt = ablk_decrypt,