diff options
Diffstat (limited to 'crypto/twofish_common.c')
-rw-r--r-- | crypto/twofish_common.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/crypto/twofish_common.c b/crypto/twofish_common.c index 0af216c75d7e..5f62c4f9f6e0 100644 --- a/crypto/twofish_common.c +++ b/crypto/twofish_common.c | |||
@@ -580,12 +580,9 @@ static const u8 calc_sb_tbl[512] = { | |||
580 | ctx->a[(j) + 1] = rol32(y, 9) | 580 | ctx->a[(j) + 1] = rol32(y, 9) |
581 | 581 | ||
582 | /* Perform the key setup. */ | 582 | /* Perform the key setup. */ |
583 | int twofish_setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int key_len) | 583 | int __twofish_setkey(struct twofish_ctx *ctx, const u8 *key, |
584 | unsigned int key_len, u32 *flags) | ||
584 | { | 585 | { |
585 | |||
586 | struct twofish_ctx *ctx = crypto_tfm_ctx(tfm); | ||
587 | u32 *flags = &tfm->crt_flags; | ||
588 | |||
589 | int i, j, k; | 586 | int i, j, k; |
590 | 587 | ||
591 | /* Temporaries for CALC_K. */ | 588 | /* Temporaries for CALC_K. */ |
@@ -701,7 +698,13 @@ int twofish_setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int key_len) | |||
701 | 698 | ||
702 | return 0; | 699 | return 0; |
703 | } | 700 | } |
701 | EXPORT_SYMBOL_GPL(__twofish_setkey); | ||
704 | 702 | ||
703 | int twofish_setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int key_len) | ||
704 | { | ||
705 | return __twofish_setkey(crypto_tfm_ctx(tfm), key, key_len, | ||
706 | &tfm->crt_flags); | ||
707 | } | ||
705 | EXPORT_SYMBOL_GPL(twofish_setkey); | 708 | EXPORT_SYMBOL_GPL(twofish_setkey); |
706 | 709 | ||
707 | MODULE_LICENSE("GPL"); | 710 | MODULE_LICENSE("GPL"); |