Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

1 files changed, 10 insertions, 1 deletions

diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c
index bd7524cfff33..68639419c5bd 100644
--- a/crypto/tcrypt.c
+++ b/crypto/tcrypt.c
@@ -72,7 +72,7 @@ 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",
-        "khazad", "wp512", "wp384", "wp256", "tnepres", NULL
+        "khazad", "wp512", "wp384", "wp256", "tnepres", "xeta", NULL
 };
 
 static void hexdump(unsigned char *buf, unsigned int len)
@@ -859,6 +859,10 @@ static void do_test(void)
                 test_cipher ("anubis", MODE_CBC, ENCRYPT, anubis_cbc_enc_tv_template, ANUBIS_CBC_ENC_TEST_VECTORS);
                 test_cipher ("anubis", MODE_CBC, DECRYPT, anubis_cbc_dec_tv_template, ANUBIS_CBC_ENC_TEST_VECTORS);
 
+                //XETA
+                test_cipher ("xeta", MODE_ECB, ENCRYPT, xeta_enc_tv_template, XETA_ENC_TEST_VECTORS);
+                test_cipher ("xeta", MODE_ECB, DECRYPT, xeta_dec_tv_template, XETA_DEC_TEST_VECTORS);
+
                 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);
@@ -1016,6 +1020,11 @@ static void do_test(void)
         case 29:
                 test_hash("tgr128", tgr128_tv_template, TGR128_TEST_VECTORS);
                 break;
+                
+        case 30:
+                test_cipher ("xeta", MODE_ECB, ENCRYPT, xeta_enc_tv_template, XETA_ENC_TEST_VECTORS);
+                test_cipher ("xeta", MODE_ECB, DECRYPT, xeta_dec_tv_template, XETA_DEC_TEST_VECTORS);
+                break;
 
 #ifdef CONFIG_CRYPTO_HMAC
         case 100: