Skip to contentSkip to conversation

s/whirlpool_tv_template/wp512_tv_template/g

PATCH In review Krzysztof Taraszka 2 participants 3 messages Oct 3, 2004 Crypto API

lore
Share & tools
lore

Krzysztof Taraszka

author
#0 lore raw

PATCH 1/1 s/whirlpool_tv_template/wp512_tv_template/g

patch for 2.4.28-pre3-bk6, fix compilation error

Signature · 3 lines
Krzysztof Taraszka                                   ([email protected])
http://cyborg.kernel.pl/~dzimi/
http://dzimi.jogger.pl/
crypto/tcrypt.c +2 -2
@@ -581,7 +581,7 @@
 
 		test_hash("sha384", sha384_tv_template, SHA384_TEST_VECTORS);
 		test_hash("sha512", sha512_tv_template, SHA512_TEST_VECTORS);
-		test_hash("whirlpool", whirlpool_tv_template, WHIRLPOOL_TEST_VECTORS);
+		test_hash("whirlpool", wp512_tv_template, WHIRLPOOL_TEST_VECTORS);
 		test_deflate();		
 #ifdef CONFIG_CRYPTO_HMAC
 		test_hmac("md5", hmac_md5_tv_template, HMAC_MD5_TEST_VECTORS);

@@ -688,7 +688,7 @@
 		test_cipher ("khazad", MODE_ECB, DECRYPT, khazad_dec_tv_template, KHAZAD_DEC_TEST_VECTORS);
 		break;
 	case 22:
-		test_hash("whirlpool", whirlpool_tv_template, WHIRLPOOL_TEST_VECTORS);
+		test_hash("whirlpool", wp512_tv_template, WHIRLPOOL_TEST_VECTORS);
 		break;
 
 #ifdef CONFIG_CRYPTO_HMAC
author
#1 lore raw
Quoted 1 line · Krzysztof Taraszka

patch for 2.4.28-pre3-bk6, fix compilation error

uuuuups, my fault, there still exist compilation error, here is right patch.

Signature · 3 lines
Krzysztof Taraszka                                   ([email protected])
http://cyborg.kernel.pl/~dzimi/
http://dzimi.jogger.pl/
crypto/tcrypt.c +2 -2
@@ -581,7 +581,7 @@
 
 		test_hash("sha384", sha384_tv_template, SHA384_TEST_VECTORS);
 		test_hash("sha512", sha512_tv_template, SHA512_TEST_VECTORS);
-		test_hash("whirlpool", whirlpool_tv_template, WHIRLPOOL_TEST_VECTORS);
+		test_hash("whirlpool", wp512_tv_template, WP512_TEST_VECTORS);
 		test_deflate();		
 #ifdef CONFIG_CRYPTO_HMAC
 		test_hmac("md5", hmac_md5_tv_template, HMAC_MD5_TEST_VECTORS);

@@ -688,7 +688,7 @@
 		test_cipher ("khazad", MODE_ECB, DECRYPT, khazad_dec_tv_template, KHAZAD_DEC_TEST_VECTORS);
 		break;
 	case 22:
-		test_hash("whirlpool", whirlpool_tv_template, WHIRLPOOL_TEST_VECTORS);
+		test_hash("whirlpool", wp512_tv_template, WP512_TEST_VECTORS);
 		break;
 
 #ifdef CONFIG_CRYPTO_HMAC
maintainer
#2 lore raw
Quoted 4 lines · On Sun, 3 Oct 2004 15:24:06 +0200 Krzysztof Taraszka <[email protected]>…

Dnia niedziela, 3 pa¼dziernika 2004 13:10, Krzysztof Taraszka napisa³:

Quoted 1 line

patch for 2.4.28-pre3-bk6, fix compilation error

uuuuups, my fault, there still exist compilation error, here is right patch.

A better fix is on the way to Marcelo, as follows:

[email protected], 2004-10-03 14:46:02-07:00, [email protected]
[CRYPTO]: Add missing tcrypt part of whirlpool updates.

Signed-off-by Aaron Grothe <[email protected]>
Signed-off-by David S. Miller <[email protected]>
crypto/tcrypt.c +14 -4
diff -Nru a/crypto/tcrypt.c b/crypto/tcrypt.c
@@ -63,7 +63,8 @@
 static char *check[] = {
 	"des", "md5", "des3_ede", "rot13", "sha1", "sha256", "blowfish",
 	"twofish", "serpent", "sha384", "sha512", "md4", "aes", "cast6", 
-	"arc4", "michael_mic", "deflate", "tea", "xtea", "whirlpool", NULL
+	"arc4", "michael_mic", "deflate", "tea", "xtea", "wp512", 
+	"wp384", "wp256", NULL
 };
 
 static void

@@ -581,7 +582,9 @@
 
 		test_hash("sha384", sha384_tv_template, SHA384_TEST_VECTORS);
 		test_hash("sha512", sha512_tv_template, SHA512_TEST_VECTORS);
-		test_hash("whirlpool", whirlpool_tv_template, WHIRLPOOL_TEST_VECTORS);
+		test_hash("wp512", wp512_tv_template, WP512_TEST_VECTORS);
+		test_hash("wp384", wp384_tv_template, WP384_TEST_VECTORS);
+		test_hash("wp256", wp256_tv_template, WP256_TEST_VECTORS);
 		test_deflate();		
 #ifdef CONFIG_CRYPTO_HMAC
 		test_hmac("md5", hmac_md5_tv_template, HMAC_MD5_TEST_VECTORS);

@@ -686,9 +689,16 @@
 	case 21:
 		test_cipher ("khazad", MODE_ECB, ENCRYPT, khazad_enc_tv_template, KHAZAD_ENC_TEST_VECTORS);
 		test_cipher ("khazad", MODE_ECB, DECRYPT, khazad_dec_tv_template, KHAZAD_DEC_TEST_VECTORS);
-		break;
 	case 22:
-		test_hash("whirlpool", whirlpool_tv_template, WHIRLPOOL_TEST_VECTORS);
+		test_hash("wp512", wp512_tv_template, WP512_TEST_VECTORS);
+		break;
+
+	case 23:
+		test_hash("wp384", wp384_tv_template, WP384_TEST_VECTORS);
+		break;
+
+	case 24:
+		test_hash("wp256", wp256_tv_template, WP256_TEST_VECTORS);
 		break;
 
 #ifdef CONFIG_CRYPTO_HMAC