diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-06 20:04:06 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-06 20:04:06 -0400 |
| commit | 359ea2f1352a77177540a213283bc7489f546ced (patch) | |
| tree | 95a313a9d920e432bafcdf68a9c7fb0812aa389b /crypto/serpent.c | |
| parent | 960b8466548c9bc6f718b5f470c1a58000fab09d (diff) | |
| parent | e1d5dea1dfbfe484358c40db7f233ed6b5605646 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'crypto/serpent.c')
| -rw-r--r-- | crypto/serpent.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/crypto/serpent.c b/crypto/serpent.c index 7d152e89016f..3cf2c5067eea 100644 --- a/crypto/serpent.c +++ b/crypto/serpent.c | |||
| @@ -210,7 +210,6 @@ | |||
| 210 | x4 ^= x2; | 210 | x4 ^= x2; |
| 211 | 211 | ||
| 212 | struct serpent_ctx { | 212 | struct serpent_ctx { |
| 213 | u8 iv[SERPENT_BLOCK_SIZE]; | ||
| 214 | u32 expkey[SERPENT_EXPKEY_WORDS]; | 213 | u32 expkey[SERPENT_EXPKEY_WORDS]; |
| 215 | }; | 214 | }; |
| 216 | 215 | ||