vserver 1.9.3

[linux-2.6.git] / crypto / tcrypt.c

diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c
index f1e631b..c23d5ee 100644 (file)
--- a/crypto/tcrypt.c
+++ b/crypto/tcrypt.c
@@ -24,6 +24,7 @@
 #include <linux/string.h>
 #include <linux/crypto.h>
 #include <linux/highmem.h>
+#include <linux/moduleparam.h>
 #include "tcrypt.h"
 
 /*
@@ -61,7 +62,8 @@ static char *tvmem;
 static char *check[] = {
        "des", "md5", "des3_ede", "rot13", "sha1", "sha256", "blowfish",
        "twofish", "serpent", "sha384", "sha512", "md4", "aes", "cast6", 
-       "arc4", "michael_mic", "deflate", "crc32c", "tea", "xtea", NULL
+       "arc4", "michael_mic", "deflate", "crc32c", "tea", "xtea", 
+       "wp512", "wp384", "wp256", NULL
 };
 
 static void
@@ -680,6 +682,9 @@ do_test(void)
 
                test_hash("sha384", sha384_tv_template, SHA384_TEST_VECTORS);
                test_hash("sha512", sha512_tv_template, SHA512_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();
                test_crc32c();
 #ifdef CONFIG_CRYPTO_HMAC
@@ -791,6 +796,19 @@ do_test(void)
                test_cipher ("khazad", MODE_ECB, DECRYPT, khazad_dec_tv_template, KHAZAD_DEC_TEST_VECTORS);
                break;
 
+       case 22:
+               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
        case 100:
                test_hmac("md5", hmac_md5_tv_template, HMAC_MD5_TEST_VECTORS);
@@ -846,7 +864,7 @@ static void __exit fini(void) { }
 module_init(init);
 module_exit(fini);
 
-MODULE_PARM(mode, "i");
+module_param(mode, int, 0);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Quick & dirty crypto testing module");