git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
crypto
/
arc4.c
diff --git
a/crypto/arc4.c
b/crypto/arc4.c
index
9efbcaa
..
5edc6a6
100644
(file)
--- a/
crypto/arc4.c
+++ b/
crypto/arc4.c
@@
-24,9
+24,10
@@
struct arc4_ctx {
u8 x, y;
};
u8 x, y;
};
-static int arc4_set_key(void *ctx_arg, const u8 *in_key, unsigned int key_len, u32 *flags)
+static int arc4_set_key(struct crypto_tfm *tfm, const u8 *in_key,
+ unsigned int key_len, u32 *flags)
{
{
- struct arc4_ctx *ctx = c
tx_arg
;
+ struct arc4_ctx *ctx = c
rypto_tfm_ctx(tfm)
;
int i, j = 0, k = 0;
ctx->x = 1;
int i, j = 0, k = 0;
ctx->x = 1;
@@
-48,9
+49,9
@@
static int arc4_set_key(void *ctx_arg, const u8 *in_key, unsigned int key_len, u
return 0;
}
return 0;
}
-static void arc4_crypt(
void *ctx_arg
, u8 *out, const u8 *in)
+static void arc4_crypt(
struct crypto_tfm *tfm
, u8 *out, const u8 *in)
{
{
- struct arc4_ctx *ctx = c
tx_arg
;
+ struct arc4_ctx *ctx = c
rypto_tfm_ctx(tfm)
;
u8 *const S = ctx->S;
u8 x = ctx->x;
u8 *const S = ctx->S;
u8 x = ctx->x;