git://git.onelab.eu / linux-2.6.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git] / crypto / tcrypt.h
diff --git a/crypto/tcrypt.h b/crypto/tcrypt.h
index 0b48ed6..18370be 100644 (file)
--- a/crypto/tcrypt.h
+++ b/crypto/tcrypt.h
@@ -1444,9 +1444,6 @@ struct cipher_testvec tf_cbc_dec_tv_template[] = {
 #define SERPENT_ENC_TEST_VECTORS       4
 #define SERPENT_DEC_TEST_VECTORS       4
 
-#define TNEPRES_ENC_TEST_VECTORS       4
-#define TNEPRES_DEC_TEST_VECTORS       4
-
 struct cipher_testvec serpent_enc_tv_template[] = 
 {
        {
@@ -1489,57 +1486,6 @@ struct cipher_testvec serpent_enc_tv_template[] =
        },
 };
 
-struct cipher_testvec tnepres_enc_tv_template[] = 
-{
-       { /* KeySize=128, PT=0, I=1 */
-               .input  = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                           0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
-               .key    = { 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                           0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
-               .klen   = 16,
-               .ilen   = 16,
-               .result = { 0x49, 0xaf, 0xbf, 0xad, 0x9d, 0x5a, 0x34, 0x05, 
-                           0x2c, 0xd8, 0xff, 0xa5, 0x98, 0x6b, 0xd2, 0xdd },
-               .rlen   = 16,
-       }, { /* KeySize=192, PT=0, I=1 */
-               .key    = { 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                           0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                           0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
-               .klen   = 24,
-               .input  = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                           0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
-               .ilen   = 16,
-               .result = { 0xe7, 0x8e, 0x54, 0x02, 0xc7, 0x19, 0x55, 0x68, 
-                           0xac, 0x36, 0x78, 0xf7, 0xa3, 0xf6, 0x0c, 0x66 },
-               .rlen   = 16,
-       }, { /* KeySize=256, PT=0, I=1 */
-               .key    = { 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                           0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                           0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                           0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
-               .klen   = 32,
-               .input  = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                           0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
-               .ilen   = 16,
-               .result = { 0xab, 0xed, 0x96, 0xe7, 0x66, 0xbf, 0x28, 0xcb, 
-                           0xc0, 0xeb, 0xd2, 0x1a, 0x82, 0xef, 0x08, 0x19 },
-               .rlen   = 16,
-       }, { /* KeySize=256, I=257 */
-               .key    = { 0x1f, 0x1e, 0x1d, 0x1c, 0x1b, 0x1a, 0x19, 0x18,
-                           0x17, 0x16, 0x15, 0x14, 0x13, 0x12, 0x11, 0x10,
-                           0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08,
-                           0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00 },
-               .klen   = 32,
-               .input  = { 0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08,
-                           0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00 },
-               .ilen   = 16,
-               .result = { 0x5c, 0xe7, 0x1c, 0x70, 0xd2, 0x88, 0x2e, 0x5b, 
-                           0xb8, 0x32, 0xe4, 0x33, 0xf8, 0x9f, 0x26, 0xde },
-               .rlen   = 16,
-       },
-};
-
-
 struct cipher_testvec serpent_dec_tv_template[] = 
 {
        {
@@ -1582,49 +1528,6 @@ struct cipher_testvec serpent_dec_tv_template[] =
        },
 };
 
-struct cipher_testvec tnepres_dec_tv_template[] =
-{
-       {
-               .input  = { 0x41, 0xcc, 0x6b, 0x31, 0x59, 0x31, 0x45, 0x97,
-                           0x6d, 0x6f, 0xbb, 0x38, 0x4b, 0x37, 0x21, 0x28 },
-               .ilen   = 16,
-               .result = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-                           0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f },
-               .rlen   = 16,
-       }, {
-               .key    = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-                           0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f },
-               .klen   = 16,
-               .input  = { 0xea, 0xf4, 0xd7, 0xfc, 0xd8, 0x01, 0x34, 0x47, 
-                           0x81, 0x45, 0x0b, 0xfa, 0x0c, 0xd6, 0xad, 0x6e },
-               .ilen   = 16,
-               .result = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-                           0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f },
-               .rlen   = 16,
-       }, {
-               .key    = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-                           0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-                           0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
-                           0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f },
-               .klen   = 32,
-               .input  = { 0x64, 0xa9, 0x1a, 0x37, 0xed, 0x9f, 0xe7, 0x49, 
-                           0xa8, 0x4e, 0x76, 0xd6, 0xf5, 0x0d, 0x78, 0xee },
-               .ilen   = 16,
-               .result = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-                           0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f },
-               .rlen   = 16,
-       }, { /* KeySize=128, I=121 */
-               .key    = { [15] = 0x80 },
-               .klen   = 16,
-               .input  = { 0x3d, 0xda, 0xbf, 0xc0, 0x06, 0xda, 0xab, 0x06, 
-                           0x46, 0x2a, 0xf4, 0xef, 0x81, 0x54, 0x4e, 0x26 },
-               .ilen   = 16,
-               .result = { [0 ... 15] = 0x00 },
-               .rlen   = 16,
-       },
-};
-
-
 /* Cast6 test vectors from RFC 2612 */
 #define CAST6_ENC_TEST_VECTORS 3
 #define CAST6_DEC_TEST_VECTORS  3
@@ -2266,211 +2169,6 @@ struct cipher_testvec khazad_dec_tv_template[] = {
        },
 };
 
-/*
- * Anubis test vectors.
- */
-
-#define ANUBIS_ENC_TEST_VECTORS                        5
-#define ANUBIS_DEC_TEST_VECTORS                        5
-#define ANUBIS_CBC_ENC_TEST_VECTORS            2
-#define ANUBIS_CBC_DEC_TEST_VECTORS            2
-
-struct cipher_testvec anubis_enc_tv_template[] = {
-       {
-               .key    = { 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe,
-                           0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe },
-               .klen   = 16,
-               .input  = { 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe,
-                           0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe },
-               .ilen   = 16,
-               .result = { 0x6d, 0xc5, 0xda, 0xa2, 0x26, 0x7d, 0x62, 0x6f,
-                           0x08, 0xb7, 0x52, 0x8e, 0x6e, 0x6e, 0x86, 0x90 },
-               .rlen   = 16,
-       }, {
-
-               .key    = { 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
-                           0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
-                           0x03, 0x03, 0x03, 0x03 },
-               .klen   = 20,
-               .input  = { 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
-                           0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03 },
-               .ilen   = 16,
-               .result = { 0xdb, 0xf1, 0x42, 0xf4, 0xd1, 0x8a, 0xc7, 0x49,
-                           0x87, 0x41, 0x6f, 0x82, 0x0a, 0x98, 0x64, 0xae },
-               .rlen   = 16,
-       }, {
-               .key    = { 0x24, 0x24, 0x24, 0x24, 0x24, 0x24, 0x24, 0x24,
-                           0x24, 0x24, 0x24, 0x24, 0x24, 0x24, 0x24, 0x24,
-                           0x24, 0x24, 0x24, 0x24, 0x24, 0x24, 0x24, 0x24,
-                           0x24, 0x24, 0x24, 0x24 },
-               .klen   = 28,
-               .input  = { 0x24, 0x24, 0x24, 0x24, 0x24, 0x24, 0x24, 0x24,
-                           0x24, 0x24, 0x24, 0x24, 0x24, 0x24, 0x24, 0x24 },
-               .ilen   = 16,
-               .result = { 0xfd, 0x1b, 0x4a, 0xe3, 0xbf, 0xf0, 0xad, 0x3d,
-                           0x06, 0xd3, 0x61, 0x27, 0xfd, 0x13, 0x9e, 0xde },
-               .rlen   = 16,
-       }, {
-               .key    = { 0x25, 0x25, 0x25, 0x25, 0x25, 0x25, 0x25, 0x25,
-                           0x25, 0x25, 0x25, 0x25, 0x25, 0x25, 0x25, 0x25,
-                           0x25, 0x25, 0x25, 0x25, 0x25, 0x25, 0x25, 0x25,
-                           0x25, 0x25, 0x25, 0x25, 0x25, 0x25, 0x25, 0x25 },
-               .klen   = 32,
-               .input  = { 0x25, 0x25, 0x25, 0x25, 0x25, 0x25, 0x25, 0x25,
-                           0x25, 0x25, 0x25, 0x25, 0x25, 0x25, 0x25, 0x25 },
-               .ilen   = 16,
-               .result = { 0x1a, 0x91, 0xfb, 0x2b, 0xb7, 0x78, 0x6b, 0xc4,
-                           0x17, 0xd9, 0xff, 0x40, 0x3b, 0x0e, 0xe5, 0xfe },
-               .rlen   = 16,
-       }, {
-               .key    = { 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35,
-                           0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35,
-                           0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35,
-                           0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35,
-                           0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35 },
-               .klen   = 40,
-               .input  = { 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35,
-                           0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35 },
-               .ilen   = 16,
-               .result = { 0xa5, 0x2c, 0x85, 0x6f, 0x9c, 0xba, 0xa0, 0x97,
-                           0x9e, 0xc6, 0x84, 0x0f, 0x17, 0x21, 0x07, 0xee },
-               .rlen   = 16,
-       },
-};
-
-struct cipher_testvec anubis_dec_tv_template[] = {
-       {
-               .key    = { 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe,
-                           0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe },
-               .klen   = 16,
-               .input  = { 0x6d, 0xc5, 0xda, 0xa2, 0x26, 0x7d, 0x62, 0x6f,
-                           0x08, 0xb7, 0x52, 0x8e, 0x6e, 0x6e, 0x86, 0x90 },
-               .ilen   = 16,
-               .result = { 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe,
-                           0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe },
-               .rlen   = 16,
-       }, {
-
-               .key    = { 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
-                           0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
-                           0x03, 0x03, 0x03, 0x03 },
-               .klen   = 20,
-               .input  = { 0xdb, 0xf1, 0x42, 0xf4, 0xd1, 0x8a, 0xc7, 0x49,
-                           0x87, 0x41, 0x6f, 0x82, 0x0a, 0x98, 0x64, 0xae },
-               .ilen   = 16,
-               .result = { 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
-                           0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03 },
-               .rlen   = 16,
-       }, {
-               .key    = { 0x24, 0x24, 0x24, 0x24, 0x24, 0x24, 0x24, 0x24,
-                           0x24, 0x24, 0x24, 0x24, 0x24, 0x24, 0x24, 0x24,
-                           0x24, 0x24, 0x24, 0x24, 0x24, 0x24, 0x24, 0x24,
-                           0x24, 0x24, 0x24, 0x24 },
-               .klen   = 28,
-               .input  = { 0xfd, 0x1b, 0x4a, 0xe3, 0xbf, 0xf0, 0xad, 0x3d,
-                           0x06, 0xd3, 0x61, 0x27, 0xfd, 0x13, 0x9e, 0xde },
-               .ilen   = 16,
-               .result = { 0x24, 0x24, 0x24, 0x24, 0x24, 0x24, 0x24, 0x24,
-                           0x24, 0x24, 0x24, 0x24, 0x24, 0x24, 0x24, 0x24 },
-               .rlen   = 16,
-       }, {
-               .key    = { 0x25, 0x25, 0x25, 0x25, 0x25, 0x25, 0x25, 0x25,
-                           0x25, 0x25, 0x25, 0x25, 0x25, 0x25, 0x25, 0x25,
-                           0x25, 0x25, 0x25, 0x25, 0x25, 0x25, 0x25, 0x25,
-                           0x25, 0x25, 0x25, 0x25, 0x25, 0x25, 0x25, 0x25 },
-               .klen   = 32,
-               .input  = { 0x1a, 0x91, 0xfb, 0x2b, 0xb7, 0x78, 0x6b, 0xc4,
-                           0x17, 0xd9, 0xff, 0x40, 0x3b, 0x0e, 0xe5, 0xfe },
-               .ilen   = 16,
-               .result = { 0x25, 0x25, 0x25, 0x25, 0x25, 0x25, 0x25, 0x25,
-                           0x25, 0x25, 0x25, 0x25, 0x25, 0x25, 0x25, 0x25 },
-               .rlen   = 16,
-       }, {
-               .key    = { 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35,
-                           0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35,
-                           0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35,
-                           0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35,
-                           0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35 },
-               .input = {  0xa5, 0x2c, 0x85, 0x6f, 0x9c, 0xba, 0xa0, 0x97,
-                           0x9e, 0xc6, 0x84, 0x0f, 0x17, 0x21, 0x07, 0xee },
-               .klen   = 40,
-               .ilen   = 16,
-               .result = { 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35,
-                           0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35 },
-               .rlen   = 16,
-       },
-};
-
-struct cipher_testvec anubis_cbc_enc_tv_template[] = {
-       {
-               .key    = { 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe,
-                           0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe },
-               .klen   = 16,
-               .input  = { 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe,
-                           0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe,
-                           0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe,
-                           0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe },
-               .ilen   = 32,
-               .result = { 0x6d, 0xc5, 0xda, 0xa2, 0x26, 0x7d, 0x62, 0x6f,
-                           0x08, 0xb7, 0x52, 0x8e, 0x6e, 0x6e, 0x86, 0x90,
-                           0x86, 0xd8, 0xb5, 0x6f, 0x98, 0x5e, 0x8a, 0x66,
-                           0x4f, 0x1f, 0x78, 0xa1, 0xbb, 0x37, 0xf1, 0xbe },
-               .rlen   = 32,
-       }, {
-               .key    = { 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35,
-                           0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35,
-                           0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35,
-                           0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35,
-                           0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35 },
-               .klen   = 40,
-               .input  = { 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35,
-                           0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35,
-                           0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35,
-                           0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35 },
-               .ilen   = 32,
-               .result = { 0xa5, 0x2c, 0x85, 0x6f, 0x9c, 0xba, 0xa0, 0x97,
-                           0x9e, 0xc6, 0x84, 0x0f, 0x17, 0x21, 0x07, 0xee,
-                           0xa2, 0xbc, 0x06, 0x98, 0xc6, 0x4b, 0xda, 0x75,
-                           0x2e, 0xaa, 0xbe, 0x58, 0xce, 0x01, 0x5b, 0xc7 },
-               .rlen   = 32,
-       },
-};
-
-struct cipher_testvec anubis_cbc_dec_tv_template[] = {
-       {
-               .key    = { 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe,
-                           0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe },
-               .klen   = 16,
-               .input  = { 0x6d, 0xc5, 0xda, 0xa2, 0x26, 0x7d, 0x62, 0x6f,
-                           0x08, 0xb7, 0x52, 0x8e, 0x6e, 0x6e, 0x86, 0x90,
-                           0x86, 0xd8, 0xb5, 0x6f, 0x98, 0x5e, 0x8a, 0x66,
-                           0x4f, 0x1f, 0x78, 0xa1, 0xbb, 0x37, 0xf1, 0xbe },
-               .ilen   = 32,
-               .result = { 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe,
-                           0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe,
-                           0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe,
-                           0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe },
-               .rlen   = 32,
-       }, {
-               .key    = { 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35,
-                           0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35,
-                           0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35,
-                           0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35,
-                           0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35 },
-               .klen   = 40,
-               .input = { 0xa5, 0x2c, 0x85, 0x6f, 0x9c, 0xba, 0xa0, 0x97,
-                           0x9e, 0xc6, 0x84, 0x0f, 0x17, 0x21, 0x07, 0xee,
-                           0xa2, 0xbc, 0x06, 0x98, 0xc6, 0x4b, 0xda, 0x75,
-                           0x2e, 0xaa, 0xbe, 0x58, 0xce, 0x01, 0x5b, 0xc7 },
-               .ilen   = 32,
-               .result = { 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35,
-                           0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35,
-                           0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35,
-                           0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35 },
-               .rlen   = 32,
-       },
-};
-
 /*
  * Compression stuff.
  */
linux-2.6