merge of '1250b8af44b62d8f4fe0f8d9fc7e7a1cc34e7e1c'

     and '7f8670ac3bb975f40967f3979d09d2199b7e90c8'

--HG--
extra : convert_revision : 6b61c50f4cf888bea302ac8fcf5dbb573b443251

1 files changed, 57 insertions, 12 deletions

diff --git a/libtomcrypt/src/encauth/gcm/gcm_test.c b/libtomcrypt/src/encauth/gcm/gcm_test.c
index 7106188..2f8539b 100644
--- a/libtomcrypt/src/encauth/gcm/gcm_test.c
+++ b/libtomcrypt/src/encauth/gcm/gcm_test.c
@@ -6,7 +6,7 @@
  * The library is free for all purposes without any express
  * guarantee it works.
  *
- * Tom St Denis, tomstdenis@gmail.com, http://libtomcrypt.org
+ * Tom St Denis, tomstdenis@gmail.com, http://libtomcrypt.com
  */
 
 /**
@@ -29,13 +29,13 @@ int gcm_test(void)
    static const struct {
        unsigned char K[32];
        int           keylen;
-       unsigned char P[64];
+       unsigned char P[128];
        unsigned long ptlen;
-		 unsigned char A[64];
+       unsigned char A[128];
        unsigned long alen;
-       unsigned char IV[64];
+       unsigned char IV[128];
        unsigned long IVlen;
-       unsigned char C[64];
+       unsigned char C[128];
        unsigned char T[16];
    } tests[] = {
 
@@ -275,13 +275,58 @@ int gcm_test(void)
    /* TAG */
    { 0x61, 0x9c, 0xc5, 0xae, 0xff, 0xfe, 0x0b, 0xfa, 
      0x46, 0x2a, 0xf4, 0x3c, 0x16, 0x99, 0xd0, 0x50, }
+},
+
+/* test case #46 from BG (catches the LTC bug of v1.15) */
+{
+   /* key */
+   { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+   16,
+
+   /* PT */
+   { 0xa2, 0xaa, 0xb3, 0xad, 0x8b, 0x17, 0xac, 0xdd, 
+     0xa2, 0x88, 0x42, 0x6c, 0xd7, 0xc4, 0x29, 0xb7, 
+     0xca, 0x86, 0xb7, 0xac, 0xa0, 0x58, 0x09, 0xc7, 
+     0x0c, 0xe8, 0x2d, 0xb2, 0x57, 0x11, 0xcb, 0x53,
+     0x02, 0xeb, 0x27, 0x43, 0xb0, 0x36, 0xf3, 0xd7, 
+     0x50, 0xd6, 0xcf, 0x0d, 0xc0, 0xac, 0xb9, 0x29, 
+     0x50, 0xd5, 0x46, 0xdb, 0x30, 0x8f, 0x93, 0xb4, 
+     0xff, 0x24, 0x4a, 0xfa, 0x9d, 0xc7, 0x2b, 0xcd,
+     0x75, 0x8d, 0x2c },
+   67,
+
+   /* ADATA */
+   { 0x68, 0x8e, 0x1a, 0xa9, 0x84, 0xde, 0x92, 0x6d, 
+     0xc7, 0xb4, 0xc4, 0x7f, 0x44 },
+   13,   
+
+   /* IV */
+   { 0xb7, 0x21, 0x38, 0xb5, 0xa0, 0x5f, 0xf5, 0x07, 
+     0x0e, 0x8c, 0xd9, 0x41, 0x83, 0xf7, 0x61, 0xd8 },
+   16,
+
+   /* CT */
+   { 0xcb, 0xc8, 0xd2, 0xf1, 0x54, 0x81, 0xa4, 0xcc, 
+     0x7d, 0xd1, 0xe1, 0x9a, 0xaa, 0x83, 0xde, 0x56, 
+     0x78, 0x48, 0x3e, 0xc3, 0x59, 0xae, 0x7d, 0xec, 
+     0x2a, 0xb8, 0xd5, 0x34, 0xe0, 0x90, 0x6f, 0x4b,
+     0x46, 0x63, 0xfa, 0xff, 0x58, 0xa8, 0xb2, 0xd7, 
+     0x33, 0xb8, 0x45, 0xee, 0xf7, 0xc9, 0xb3, 0x31, 
+     0xe9, 0xe1, 0x0e, 0xb2, 0x61, 0x2c, 0x99, 0x5f, 
+     0xeb, 0x1a, 0xc1, 0x5a, 0x62, 0x86, 0xcc, 0xe8,
+     0xb2, 0x97, 0xa8 },
+
+   /* TAG */
+   { 0x8d, 0x2d, 0x2a, 0x93, 0x72, 0x62, 0x6f, 0x6b, 
+     0xee, 0x85, 0x80, 0x27, 0x6a, 0x63, 0x66, 0xbf }
 }
 
 /* rest of test cases are the same except AES key size changes... ignored... */
 };
    int           idx, err;
    unsigned long x, y;
-   unsigned char out[2][64], T[2][16];
+   unsigned char out[2][128], T[2][16];
 
    /* find aes */
    idx = find_cipher("aes");
@@ -302,7 +347,7 @@ int gcm_test(void)
           return err;
        }
 
-       if (memcmp(out[0], tests[x].C, tests[x].ptlen)) {
+       if (XMEMCMP(out[0], tests[x].C, tests[x].ptlen)) {
 #if 0
           printf("\nCiphertext wrong %lu\n", x);
           for (y = 0; y < tests[x].ptlen; y++) {
@@ -313,7 +358,7 @@ int gcm_test(void)
           return CRYPT_FAIL_TESTVECTOR;
        }
 
-       if (memcmp(T[0], tests[x].T, 16)) {
+       if (XMEMCMP(T[0], tests[x].T, 16)) {
 #if 0
           printf("\nTag on plaintext wrong %lu\n", x);
           for (y = 0; y < 16; y++) {
@@ -333,7 +378,7 @@ int gcm_test(void)
           return err;
        }
 
-       if (memcmp(out[1], tests[x].P, tests[x].ptlen)) {
+       if (XMEMCMP(out[1], tests[x].P, tests[x].ptlen)) {
 #if 0
           printf("\nplaintext wrong %lu\n", x);
           for (y = 0; y < tests[x].ptlen; y++) {
@@ -344,7 +389,7 @@ int gcm_test(void)
           return CRYPT_FAIL_TESTVECTOR;
        }
 
-       if (memcmp(T[1], tests[x].T, 16)) {
+       if (XMEMCMP(T[1], tests[x].T, 16)) {
 #if 0
           printf("\nTag on ciphertext wrong %lu\n", x);
           for (y = 0; y < 16; y++) {
@@ -364,5 +409,5 @@ int gcm_test(void)
 
 
 /* $Source: /cvs/libtom/libtomcrypt/src/encauth/gcm/gcm_test.c,v $ */
-/* $Revision: 1.15 $ */
-/* $Date: 2005/05/05 14:35:58 $ */
+/* $Revision: 1.20 $ */
+/* $Date: 2006/12/03 17:25:44 $ */