public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] s/whirlpool_tv_template/wp512_tv_template/g
@ 2004-10-03 11:10 Krzysztof Taraszka
  2004-10-03 13:24 ` Krzysztof Taraszka
  0 siblings, 1 reply; 3+ messages in thread
From: Krzysztof Taraszka @ 2004-10-03 11:10 UTC (permalink / raw)
  To: linux-kernel

[-- Attachment #1: Type: text/plain, Size: 185 bytes --]

patch for 2.4.28-pre3-bk6, fix compilation error

-- 
Krzysztof Taraszka                                   (dzimi@pld-linux.org)
http://cyborg.kernel.pl/~dzimi/
http://dzimi.jogger.pl/

[-- Attachment #2: patch-2.4.28-pre3-bk6-wp512-tcrypt.c.patch --]
[-- Type: text/x-diff, Size: 890 bytes --]

--- linux-2.4.28-pre3-bk6.orig/crypto/tcrypt.c	2004-10-03 13:03:26.000000000 +0200
+++ linux-2.4.28-pre3-bk6/crypto/tcrypt.c	2004-10-03 13:07:49.266052776 +0200
@@ -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

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] s/whirlpool_tv_template/wp512_tv_template/g
  2004-10-03 11:10 [PATCH] s/whirlpool_tv_template/wp512_tv_template/g Krzysztof Taraszka
@ 2004-10-03 13:24 ` Krzysztof Taraszka
  2004-10-03 22:51   ` David S. Miller
  0 siblings, 1 reply; 3+ messages in thread
From: Krzysztof Taraszka @ 2004-10-03 13:24 UTC (permalink / raw)
  To: linux-kernel

[-- Attachment #1: Type: text/plain, Size: 345 bytes --]

Dnia niedziela, 3 października 2004 13:10, Krzysztof Taraszka napisał:
> patch for 2.4.28-pre3-bk6, fix compilation error

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

-- 
Krzysztof Taraszka                                   (dzimi@pld-linux.org)
http://cyborg.kernel.pl/~dzimi/
http://dzimi.jogger.pl/

[-- Attachment #2: patch-2.4.28-pre3-bk6-wp512-tcrypt.c.patch --]
[-- Type: text/x-diff, Size: 882 bytes --]

--- linux-2.4.28-pre3-bk6.orig/crypto/tcrypt.c	2004-10-03 13:03:26.000000000 +0200
+++ linux-2.4.28-pre3-bk6/crypto/tcrypt.c	2004-10-03 15:21:39.315299736 +0200
@@ -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

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] s/whirlpool_tv_template/wp512_tv_template/g
  2004-10-03 13:24 ` Krzysztof Taraszka
@ 2004-10-03 22:51   ` David S. Miller
  0 siblings, 0 replies; 3+ messages in thread
From: David S. Miller @ 2004-10-03 22:51 UTC (permalink / raw)
  To: Krzysztof Taraszka; +Cc: linux-kernel

On Sun, 3 Oct 2004 15:24:06 +0200
Krzysztof Taraszka <dzimi@pld-linux.org> wrote:

> Dnia niedziela, 3 pa¼dziernika 2004 13:10, Krzysztof Taraszka napisa³:
> > 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:

ChangeSet@1.1577, 2004-10-03 14:46:02-07:00, ajgrothe@yahoo.com
  [CRYPTO]: Add missing tcrypt part of whirlpool updates.
  
  Signed-off-by: Aaron Grothe <ajgrothe@yahoo.com>
  Signed-off-by: David S. Miller <davem@davemloft.net>

diff -Nru a/crypto/tcrypt.c b/crypto/tcrypt.c
--- a/crypto/tcrypt.c	2004-10-03 22:17:12 -07:00
+++ b/crypto/tcrypt.c	2004-10-03 22:17:12 -07:00
@@ -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



^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2004-10-03 22:53 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-10-03 11:10 [PATCH] s/whirlpool_tv_template/wp512_tv_template/g Krzysztof Taraszka
2004-10-03 13:24 ` Krzysztof Taraszka
2004-10-03 22:51   ` David S. Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox