diff options
| author | Jeremy Linton <jeremy.linton@arm.com> | 2016-02-12 10:47:52 -0500 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2016-02-15 10:48:29 -0500 |
| commit | bee038a4bd2efe8188cc80dfdad706a9abe568ad (patch) | |
| tree | 85593afed3cdc6e1bc270e5d9aa02d35094c0cf3 | |
| parent | a80a0eb70c358f8c7dda4bb62b2278dc6285217b (diff) | |
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>
| -rw-r--r-- | arch/arm/crypto/aes-ce-glue.c | 4 | ||||
| -rw-r--r-- | arch/arm64/crypto/aes-glue.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/crypto/aes-ce-glue.c b/arch/arm/crypto/aes-ce-glue.c index b445a5d56f43..89a3a3e592d6 100644 --- a/arch/arm/crypto/aes-ce-glue.c +++ b/arch/arm/crypto/aes-ce-glue.c | |||
| @@ -364,7 +364,7 @@ static struct crypto_alg aes_algs[] = { { | |||
| 364 | .cra_blkcipher = { | 364 | .cra_blkcipher = { |
| 365 | .min_keysize = AES_MIN_KEY_SIZE, | 365 | .min_keysize = AES_MIN_KEY_SIZE, |
| 366 | .max_keysize = AES_MAX_KEY_SIZE, | 366 | .max_keysize = AES_MAX_KEY_SIZE, |
| 367 | .ivsize = AES_BLOCK_SIZE, | 367 | .ivsize = 0, |
| 368 | .setkey = ce_aes_setkey, | 368 | .setkey = ce_aes_setkey, |
| 369 | .encrypt = ecb_encrypt, | 369 | .encrypt = ecb_encrypt, |
| 370 | .decrypt = ecb_decrypt, | 370 | .decrypt = ecb_decrypt, |
| @@ -441,7 +441,7 @@ static struct crypto_alg aes_algs[] = { { | |||
| 441 | .cra_ablkcipher = { | 441 | .cra_ablkcipher = { |
| 442 | .min_keysize = AES_MIN_KEY_SIZE, | 442 | .min_keysize = AES_MIN_KEY_SIZE, |
| 443 | .max_keysize = AES_MAX_KEY_SIZE, | 443 | .max_keysize = AES_MAX_KEY_SIZE, |
| 444 | .ivsize = AES_BLOCK_SIZE, | 444 | .ivsize = 0, |
| 445 | .setkey = ablk_set_key, | 445 | .setkey = ablk_set_key, |
| 446 | .encrypt = ablk_encrypt, | 446 | .encrypt = ablk_encrypt, |
| 447 | .decrypt = ablk_decrypt, | 447 | .decrypt = ablk_decrypt, |
diff --git a/arch/arm64/crypto/aes-glue.c b/arch/arm64/crypto/aes-glue.c index 05d9e16c0dfd..7a3d22a46faf 100644 --- a/arch/arm64/crypto/aes-glue.c +++ b/arch/arm64/crypto/aes-glue.c | |||
| @@ -294,7 +294,7 @@ static struct crypto_alg aes_algs[] = { { | |||
| 294 | .cra_blkcipher = { | 294 | .cra_blkcipher = { |
| 295 | .min_keysize = AES_MIN_KEY_SIZE, | 295 | .min_keysize = AES_MIN_KEY_SIZE, |
| 296 | .max_keysize = AES_MAX_KEY_SIZE, | 296 | .max_keysize = AES_MAX_KEY_SIZE, |
| 297 | .ivsize = AES_BLOCK_SIZE, | 297 | .ivsize = 0, |
| 298 | .setkey = aes_setkey, | 298 | .setkey = aes_setkey, |
| 299 | .encrypt = ecb_encrypt, | 299 | .encrypt = ecb_encrypt, |
| 300 | .decrypt = ecb_decrypt, | 300 | .decrypt = ecb_decrypt, |
| @@ -371,7 +371,7 @@ static struct crypto_alg aes_algs[] = { { | |||
| 371 | .cra_ablkcipher = { | 371 | .cra_ablkcipher = { |
| 372 | .min_keysize = AES_MIN_KEY_SIZE, | 372 | .min_keysize = AES_MIN_KEY_SIZE, |
| 373 | .max_keysize = AES_MAX_KEY_SIZE, | 373 | .max_keysize = AES_MAX_KEY_SIZE, |
| 374 | .ivsize = AES_BLOCK_SIZE, | 374 | .ivsize = 0, |
| 375 | .setkey = ablk_set_key, | 375 | .setkey = ablk_set_key, |
| 376 | .encrypt = ablk_encrypt, | 376 | .encrypt = ablk_encrypt, |
| 377 | .decrypt = ablk_decrypt, | 377 | .decrypt = ablk_decrypt, |