diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-07-11 01:58:04 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-07-11 01:58:04 -0400 |
| commit | e0d21d9cca25f424f3129649be48a63c128ed42d (patch) | |
| tree | 0a7d407639876e02deef1721817615eaa8c673a3 /crypto/serpent.c | |
| parent | beffbdc2211826b174c68307b1b48c93c05d7ded (diff) | |
| parent | 5c23804a0941a111752fdacefe0bea2db1b4d93f (diff) | |
Merge rsync://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-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 | ||