diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2006-05-16 08:09:29 -0400 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2006-06-26 03:34:39 -0400 |
commit | 6c2bb98bc33ae33c7a33a133a4cd5a06395fece5 (patch) | |
tree | 96684cd2c473cd05d651ce1fa3dd72b1b4b19b09 /crypto/twofish.c | |
parent | 43600106e32809a4dead79fec67a63e9860e3d5d (diff) |
[CRYPTO] all: Pass tfm instead of ctx to algorithms
Up until now algorithms have been happy to get a context pointer since
they know everything that's in the tfm already (e.g., alignment, block
size).
However, once we have parameterised algorithms, such information will
be specific to each tfm. So the algorithm API needs to be changed to
pass the tfm structure instead of the context pointer.
This patch is basically a text substitution. The only tricky bit is
the assembly routines that need to get the context pointer offset
through asm-offsets.h.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto/twofish.c')
-rw-r--r-- | crypto/twofish.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/crypto/twofish.c b/crypto/twofish.c index ddfd5a3fcc5f..ec2488242e2d 100644 --- a/crypto/twofish.c +++ b/crypto/twofish.c | |||
@@ -643,11 +643,11 @@ struct twofish_ctx { | |||
643 | }; | 643 | }; |
644 | 644 | ||
645 | /* Perform the key setup. */ | 645 | /* Perform the key setup. */ |
646 | static int twofish_setkey(void *cx, const u8 *key, | 646 | static int twofish_setkey(struct crypto_tfm *tfm, const u8 *key, |
647 | unsigned int key_len, u32 *flags) | 647 | unsigned int key_len, u32 *flags) |
648 | { | 648 | { |
649 | 649 | ||
650 | struct twofish_ctx *ctx = cx; | 650 | struct twofish_ctx *ctx = crypto_tfm_ctx(tfm); |
651 | 651 | ||
652 | int i, j, k; | 652 | int i, j, k; |
653 | 653 | ||
@@ -802,9 +802,9 @@ static int twofish_setkey(void *cx, const u8 *key, | |||
802 | } | 802 | } |
803 | 803 | ||
804 | /* Encrypt one block. in and out may be the same. */ | 804 | /* Encrypt one block. in and out may be the same. */ |
805 | static void twofish_encrypt(void *cx, u8 *out, const u8 *in) | 805 | static void twofish_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in) |
806 | { | 806 | { |
807 | struct twofish_ctx *ctx = cx; | 807 | struct twofish_ctx *ctx = crypto_tfm_ctx(tfm); |
808 | const __le32 *src = (const __le32 *)in; | 808 | const __le32 *src = (const __le32 *)in; |
809 | __le32 *dst = (__le32 *)out; | 809 | __le32 *dst = (__le32 *)out; |
810 | 810 | ||
@@ -839,9 +839,9 @@ static void twofish_encrypt(void *cx, u8 *out, const u8 *in) | |||
839 | } | 839 | } |
840 | 840 | ||
841 | /* Decrypt one block. in and out may be the same. */ | 841 | /* Decrypt one block. in and out may be the same. */ |
842 | static void twofish_decrypt(void *cx, u8 *out, const u8 *in) | 842 | static void twofish_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in) |
843 | { | 843 | { |
844 | struct twofish_ctx *ctx = cx; | 844 | struct twofish_ctx *ctx = crypto_tfm_ctx(tfm); |
845 | const __le32 *src = (const __le32 *)in; | 845 | const __le32 *src = (const __le32 *)in; |
846 | __le32 *dst = (__le32 *)out; | 846 | __le32 *dst = (__le32 *)out; |
847 | 847 | ||