diff options
Diffstat (limited to 'crypto/skcipher.c')
-rw-r--r-- | crypto/skcipher.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/crypto/skcipher.c b/crypto/skcipher.c index 41b4f7f27f45..2a969296bc24 100644 --- a/crypto/skcipher.c +++ b/crypto/skcipher.c | |||
@@ -579,8 +579,7 @@ static unsigned int crypto_skcipher_extsize(struct crypto_alg *alg) | |||
579 | if (alg->cra_type == &crypto_blkcipher_type) | 579 | if (alg->cra_type == &crypto_blkcipher_type) |
580 | return sizeof(struct crypto_blkcipher *); | 580 | return sizeof(struct crypto_blkcipher *); |
581 | 581 | ||
582 | if (alg->cra_type == &crypto_ablkcipher_type || | 582 | if (alg->cra_type == &crypto_ablkcipher_type) |
583 | alg->cra_type == &crypto_givcipher_type) | ||
584 | return sizeof(struct crypto_ablkcipher *); | 583 | return sizeof(struct crypto_ablkcipher *); |
585 | 584 | ||
586 | return crypto_alg_extsize(alg); | 585 | return crypto_alg_extsize(alg); |
@@ -844,8 +843,7 @@ static int crypto_skcipher_init_tfm(struct crypto_tfm *tfm) | |||
844 | if (tfm->__crt_alg->cra_type == &crypto_blkcipher_type) | 843 | if (tfm->__crt_alg->cra_type == &crypto_blkcipher_type) |
845 | return crypto_init_skcipher_ops_blkcipher(tfm); | 844 | return crypto_init_skcipher_ops_blkcipher(tfm); |
846 | 845 | ||
847 | if (tfm->__crt_alg->cra_type == &crypto_ablkcipher_type || | 846 | if (tfm->__crt_alg->cra_type == &crypto_ablkcipher_type) |
848 | tfm->__crt_alg->cra_type == &crypto_givcipher_type) | ||
849 | return crypto_init_skcipher_ops_ablkcipher(tfm); | 847 | return crypto_init_skcipher_ops_ablkcipher(tfm); |
850 | 848 | ||
851 | skcipher->setkey = skcipher_setkey; | 849 | skcipher->setkey = skcipher_setkey; |