X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=crypto%2Fcamellia.c;h=964635d163f4767a9ff7a47c271fb1f5bd3a6c59;hb=36f87a4a29cb8cd291169483079fde34bad4ef16;hp=b1cc4de6493cfa7604187e4f05429d84f6ad2e58;hpb=bd699f2df6dbc2f4cba528fe598bd63a4d3702c5;p=safe%2Fjmp%2Flinux-2.6

diff --git a/crypto/camellia.c b/crypto/camellia.c
index b1cc4de..964635d 100644
--- a/crypto/camellia.c
+++ b/crypto/camellia.c
@@ -569,7 +569,7 @@ static void camellia_setup_tail(u32 *subkey, u32 *subL, u32 *subR, int max)
 		SUBKEY_R(i + 2) = SUBKEY_L(i + 2) ^ dw; SUBKEY_L(i + 2) = dw;
 		dw = SUBKEY_L(i + 3) ^ SUBKEY_R(i + 3); dw = rol32(dw, 8);/* round 4 */
 		SUBKEY_R(i + 3) = SUBKEY_L(i + 3) ^ dw; SUBKEY_L(i + 3) = dw;
-		dw = SUBKEY_L(i + 4) ^ SUBKEY_R(i + 4); dw = rol32(dw, 9);/* round 5 */
+		dw = SUBKEY_L(i + 4) ^ SUBKEY_R(i + 4); dw = rol32(dw, 8);/* round 5 */
 		SUBKEY_R(i + 4) = SUBKEY_L(i + 4) ^ dw; SUBKEY_L(i + 4) = dw;
 		dw = SUBKEY_L(i + 5) ^ SUBKEY_R(i + 5); dw = rol32(dw, 8);/* round 6 */
 		SUBKEY_R(i + 5) = SUBKEY_L(i + 5) ^ dw; SUBKEY_L(i + 5) = dw;