diff options
author | Marek Vasut <marex@denx.de> | 2014-05-14 05:36:38 -0400 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2014-05-22 09:03:11 -0400 |
commit | b9d865e331290dab97136413a9cf3465f3391ddf (patch) | |
tree | c6a2e2aa0998f08e32363bd7e51eff14d635b0fc /drivers/crypto/geode-aes.c | |
parent | 5fc8005ba3e0bb5ea791fcc7248d0a2fb3e6c680 (diff) |
crypto: geode - Kill AES_MIN_BLOCK_SIZE
This is actually defined in include/crypto/aes.h , no need to have
a a different symbol for the same thing twice.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
Cc: Eric BĂ©nard <eric@eukrea.com>
Cc: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Cc: Kent Yoder <key@linux.vnet.ibm.com>
Cc: Michal Ludvig <michal@logix.cz>
Cc: Varun Wadekar <vwadekar@nvidia.com>
Cc: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
Cc: linux-geode@lists.infradead.org
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/crypto/geode-aes.c')
-rw-r--r-- | drivers/crypto/geode-aes.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/crypto/geode-aes.c b/drivers/crypto/geode-aes.c index 0c9ff4971724..32001d6b76ef 100644 --- a/drivers/crypto/geode-aes.c +++ b/drivers/crypto/geode-aes.c | |||
@@ -226,7 +226,7 @@ geode_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in) | |||
226 | op->dst = (void *) out; | 226 | op->dst = (void *) out; |
227 | op->mode = AES_MODE_ECB; | 227 | op->mode = AES_MODE_ECB; |
228 | op->flags = 0; | 228 | op->flags = 0; |
229 | op->len = AES_MIN_BLOCK_SIZE; | 229 | op->len = AES_BLOCK_SIZE; |
230 | op->dir = AES_DIR_ENCRYPT; | 230 | op->dir = AES_DIR_ENCRYPT; |
231 | 231 | ||
232 | geode_aes_crypt(op); | 232 | geode_aes_crypt(op); |
@@ -247,7 +247,7 @@ geode_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in) | |||
247 | op->dst = (void *) out; | 247 | op->dst = (void *) out; |
248 | op->mode = AES_MODE_ECB; | 248 | op->mode = AES_MODE_ECB; |
249 | op->flags = 0; | 249 | op->flags = 0; |
250 | op->len = AES_MIN_BLOCK_SIZE; | 250 | op->len = AES_BLOCK_SIZE; |
251 | op->dir = AES_DIR_DECRYPT; | 251 | op->dir = AES_DIR_DECRYPT; |
252 | 252 | ||
253 | geode_aes_crypt(op); | 253 | geode_aes_crypt(op); |
@@ -286,7 +286,7 @@ static struct crypto_alg geode_alg = { | |||
286 | CRYPTO_ALG_NEED_FALLBACK, | 286 | CRYPTO_ALG_NEED_FALLBACK, |
287 | .cra_init = fallback_init_cip, | 287 | .cra_init = fallback_init_cip, |
288 | .cra_exit = fallback_exit_cip, | 288 | .cra_exit = fallback_exit_cip, |
289 | .cra_blocksize = AES_MIN_BLOCK_SIZE, | 289 | .cra_blocksize = AES_BLOCK_SIZE, |
290 | .cra_ctxsize = sizeof(struct geode_aes_op), | 290 | .cra_ctxsize = sizeof(struct geode_aes_op), |
291 | .cra_module = THIS_MODULE, | 291 | .cra_module = THIS_MODULE, |
292 | .cra_u = { | 292 | .cra_u = { |
@@ -320,7 +320,7 @@ geode_cbc_decrypt(struct blkcipher_desc *desc, | |||
320 | op->src = walk.src.virt.addr, | 320 | op->src = walk.src.virt.addr, |
321 | op->dst = walk.dst.virt.addr; | 321 | op->dst = walk.dst.virt.addr; |
322 | op->mode = AES_MODE_CBC; | 322 | op->mode = AES_MODE_CBC; |
323 | op->len = nbytes - (nbytes % AES_MIN_BLOCK_SIZE); | 323 | op->len = nbytes - (nbytes % AES_BLOCK_SIZE); |
324 | op->dir = AES_DIR_DECRYPT; | 324 | op->dir = AES_DIR_DECRYPT; |
325 | 325 | ||
326 | ret = geode_aes_crypt(op); | 326 | ret = geode_aes_crypt(op); |
@@ -352,7 +352,7 @@ geode_cbc_encrypt(struct blkcipher_desc *desc, | |||
352 | op->src = walk.src.virt.addr, | 352 | op->src = walk.src.virt.addr, |
353 | op->dst = walk.dst.virt.addr; | 353 | op->dst = walk.dst.virt.addr; |
354 | op->mode = AES_MODE_CBC; | 354 | op->mode = AES_MODE_CBC; |
355 | op->len = nbytes - (nbytes % AES_MIN_BLOCK_SIZE); | 355 | op->len = nbytes - (nbytes % AES_BLOCK_SIZE); |
356 | op->dir = AES_DIR_ENCRYPT; | 356 | op->dir = AES_DIR_ENCRYPT; |
357 | 357 | ||
358 | ret = geode_aes_crypt(op); | 358 | ret = geode_aes_crypt(op); |
@@ -396,7 +396,7 @@ static struct crypto_alg geode_cbc_alg = { | |||
396 | CRYPTO_ALG_NEED_FALLBACK, | 396 | CRYPTO_ALG_NEED_FALLBACK, |
397 | .cra_init = fallback_init_blk, | 397 | .cra_init = fallback_init_blk, |
398 | .cra_exit = fallback_exit_blk, | 398 | .cra_exit = fallback_exit_blk, |
399 | .cra_blocksize = AES_MIN_BLOCK_SIZE, | 399 | .cra_blocksize = AES_BLOCK_SIZE, |
400 | .cra_ctxsize = sizeof(struct geode_aes_op), | 400 | .cra_ctxsize = sizeof(struct geode_aes_op), |
401 | .cra_alignmask = 15, | 401 | .cra_alignmask = 15, |
402 | .cra_type = &crypto_blkcipher_type, | 402 | .cra_type = &crypto_blkcipher_type, |
@@ -432,7 +432,7 @@ geode_ecb_decrypt(struct blkcipher_desc *desc, | |||
432 | op->src = walk.src.virt.addr, | 432 | op->src = walk.src.virt.addr, |
433 | op->dst = walk.dst.virt.addr; | 433 | op->dst = walk.dst.virt.addr; |
434 | op->mode = AES_MODE_ECB; | 434 | op->mode = AES_MODE_ECB; |
435 | op->len = nbytes - (nbytes % AES_MIN_BLOCK_SIZE); | 435 | op->len = nbytes - (nbytes % AES_BLOCK_SIZE); |
436 | op->dir = AES_DIR_DECRYPT; | 436 | op->dir = AES_DIR_DECRYPT; |
437 | 437 | ||
438 | ret = geode_aes_crypt(op); | 438 | ret = geode_aes_crypt(op); |
@@ -462,7 +462,7 @@ geode_ecb_encrypt(struct blkcipher_desc *desc, | |||
462 | op->src = walk.src.virt.addr, | 462 | op->src = walk.src.virt.addr, |
463 | op->dst = walk.dst.virt.addr; | 463 | op->dst = walk.dst.virt.addr; |
464 | op->mode = AES_MODE_ECB; | 464 | op->mode = AES_MODE_ECB; |
465 | op->len = nbytes - (nbytes % AES_MIN_BLOCK_SIZE); | 465 | op->len = nbytes - (nbytes % AES_BLOCK_SIZE); |
466 | op->dir = AES_DIR_ENCRYPT; | 466 | op->dir = AES_DIR_ENCRYPT; |
467 | 467 | ||
468 | ret = geode_aes_crypt(op); | 468 | ret = geode_aes_crypt(op); |
@@ -482,7 +482,7 @@ static struct crypto_alg geode_ecb_alg = { | |||
482 | CRYPTO_ALG_NEED_FALLBACK, | 482 | CRYPTO_ALG_NEED_FALLBACK, |
483 | .cra_init = fallback_init_blk, | 483 | .cra_init = fallback_init_blk, |
484 | .cra_exit = fallback_exit_blk, | 484 | .cra_exit = fallback_exit_blk, |
485 | .cra_blocksize = AES_MIN_BLOCK_SIZE, | 485 | .cra_blocksize = AES_BLOCK_SIZE, |
486 | .cra_ctxsize = sizeof(struct geode_aes_op), | 486 | .cra_ctxsize = sizeof(struct geode_aes_op), |
487 | .cra_alignmask = 15, | 487 | .cra_alignmask = 15, |
488 | .cra_type = &crypto_blkcipher_type, | 488 | .cra_type = &crypto_blkcipher_type, |