merge from main

--HG--
branch : fuzz

7 files changed, 612 insertions, 309 deletions

diff --git a/libtomcrypt/src/mac/hmac/hmac_done.c b/libtomcrypt/src/mac/hmac/hmac_done.c
index 9046110..221df99 100644
--- a/libtomcrypt/src/mac/hmac/hmac_done.c
+++ b/libtomcrypt/src/mac/hmac/hmac_done.c
@@ -5,14 +5,12 @@
  *
  * The library is free for all purposes without any express
  * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
  */
 #include "tomcrypt.h"
 
 /**
   @file hmac_done.c
-  LTC_HMAC support, terminate stream, Tom St Denis/Dobes Vandermeer
+  HMAC support, terminate stream, Tom St Denis/Dobes Vandermeer
 */
 
 #ifdef LTC_HMAC
@@ -20,10 +18,10 @@
 #define LTC_HMAC_BLOCKSIZE hash_descriptor[hash].blocksize
 
 /**
-   Terminate an LTC_HMAC session
-   @param hmac    The LTC_HMAC state
-   @param out     [out] The destination of the LTC_HMAC authentication tag
-   @param outlen  [in/out]  The max size and resulting size of the LTC_HMAC authentication tag
+   Terminate an HMAC session
+   @param hmac    The HMAC state
+   @param out     [out] The destination of the HMAC authentication tag
+   @param outlen  [in/out]  The max size and resulting size of the HMAC authentication tag
    @return CRYPT_OK if successful
 */
 int hmac_done(hmac_state *hmac, unsigned char *out, unsigned long *outlen)
@@ -48,7 +46,7 @@ int hmac_done(hmac_state *hmac, unsigned char *out, unsigned long *outlen)
        goto LBL_ERR;
     }
 
-    /* Create the second LTC_HMAC vector vector for step (3) */
+    /* Create the second HMAC vector vector for step (3) */
     for(i=0; i < LTC_HMAC_BLOCKSIZE; i++) {
         buf[i] = hmac->key[i] ^ 0x5C;
     }
@@ -87,6 +85,6 @@ LBL_ERR:
 
 #endif
 
-/* $Source$ */
-/* $Revision$ */
-/* $Date$ */
+/* ref:         $Format:%D$ */
+/* git commit:  $Format:%H$ */
+/* commit time: $Format:%ai$ */
diff --git a/libtomcrypt/src/mac/hmac/hmac_file.c b/libtomcrypt/src/mac/hmac/hmac_file.c
index d9841bd..c106941 100644
--- a/libtomcrypt/src/mac/hmac/hmac_file.c
+++ b/libtomcrypt/src/mac/hmac/hmac_file.c
@@ -5,30 +5,28 @@
  *
  * The library is free for all purposes without any express
  * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
  */
 #include "tomcrypt.h"
 
 /**
   @file hmac_file.c
-  LTC_HMAC support, process a file, Tom St Denis/Dobes Vandermeer
+  HMAC support, process a file, Tom St Denis/Dobes Vandermeer
 */
 
 #ifdef LTC_HMAC
 
 /**
-  LTC_HMAC a file
+  HMAC a file
   @param hash     The index of the hash you wish to use
-  @param fname    The name of the file you wish to LTC_HMAC
+  @param fname    The name of the file you wish to HMAC
   @param key      The secret key
   @param keylen   The length of the secret key
-  @param out      [out] The LTC_HMAC authentication tag
+  @param out      [out] The HMAC authentication tag
   @param outlen   [in/out]  The max size and resulting size of the authentication tag
   @return CRYPT_OK if successful, CRYPT_NOP if file support has been disabled
 */
-int hmac_file(int hash, const char *fname, 
-              const unsigned char *key, unsigned long keylen, 
+int hmac_file(int hash, const char *fname,
+              const unsigned char *key, unsigned long keylen,
                     unsigned char *out, unsigned long *outlen)
 {
 #ifdef LTC_NO_FILE
@@ -37,7 +35,7 @@ int hmac_file(int hash, const char *fname,
 #else
    hmac_state hmac;
    FILE *in;
-   unsigned char buf[512];
+   unsigned char *buf;
    size_t x;
    int err;
 
@@ -45,50 +43,53 @@ int hmac_file(int hash, const char *fname,
    LTC_ARGCHK(key    != NULL);
    LTC_ARGCHK(out    != NULL);
    LTC_ARGCHK(outlen != NULL);
-   
-   if((err = hash_is_valid(hash)) != CRYPT_OK) {
-       return err;
+
+   if ((buf = XMALLOC(LTC_FILE_READ_BUFSIZE)) == NULL) {
+      return CRYPT_MEM;
+   }
+
+   if ((err = hash_is_valid(hash)) != CRYPT_OK) {
+      goto LBL_ERR;
    }
 
    if ((err = hmac_init(&hmac, hash, key, keylen)) != CRYPT_OK) {
-       return err;
+      goto LBL_ERR;
    }
 
    in = fopen(fname, "rb");
    if (in == NULL) {
-      return CRYPT_FILE_NOTFOUND;
+      err = CRYPT_FILE_NOTFOUND;
+      goto LBL_ERR;
    }
 
-   /* process the file contents */
    do {
-      x = fread(buf, 1, sizeof(buf), in);
+      x = fread(buf, 1, LTC_FILE_READ_BUFSIZE, in);
       if ((err = hmac_process(&hmac, buf, (unsigned long)x)) != CRYPT_OK) {
-         /* we don't trap this error since we're already returning an error! */
-         fclose(in);
-         return err;
+         fclose(in); /* we don't trap this error since we're already returning an error! */
+         goto LBL_CLEANBUF;
       }
-   } while (x == sizeof(buf));
+   } while (x == LTC_FILE_READ_BUFSIZE);
 
    if (fclose(in) != 0) {
-      return CRYPT_ERROR;
+      err = CRYPT_ERROR;
+      goto LBL_CLEANBUF;
    }
 
-   /* get final hmac */
-   if ((err = hmac_done(&hmac, out, outlen)) != CRYPT_OK) {
-      return err;
-   }
+   err = hmac_done(&hmac, out, outlen);
 
+LBL_CLEANBUF:
+   zeromem(buf, LTC_FILE_READ_BUFSIZE);
+LBL_ERR:
 #ifdef LTC_CLEAN_STACK
-   /* clear memory */
-   zeromem(buf, sizeof(buf));
-#endif   
-   return CRYPT_OK;
+   zeromem(&hmac, sizeof(hmac_state));
+#endif
+   XFREE(buf);
+   return err;
 #endif
 }
 
 #endif
 
-
-/* $Source$ */
-/* $Revision$ */
-/* $Date$ */
+/* ref:         $Format:%D$ */
+/* git commit:  $Format:%H$ */
+/* commit time: $Format:%ai$ */
diff --git a/libtomcrypt/src/mac/hmac/hmac_init.c b/libtomcrypt/src/mac/hmac/hmac_init.c
index 262002e..57eca7b 100644
--- a/libtomcrypt/src/mac/hmac/hmac_init.c
+++ b/libtomcrypt/src/mac/hmac/hmac_init.c
@@ -5,14 +5,12 @@
  *
  * The library is free for all purposes without any express
  * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
  */
 #include "tomcrypt.h"
 
 /**
   @file hmac_init.c
-  LTC_HMAC support, initialize state, Tom St Denis/Dobes Vandermeer 
+  HMAC support, initialize state, Tom St Denis/Dobes Vandermeer
 */
 
 #ifdef LTC_HMAC
@@ -20,8 +18,8 @@
 #define LTC_HMAC_BLOCKSIZE hash_descriptor[hash].blocksize
 
 /**
-   Initialize an LTC_HMAC context.
-   @param hmac     The LTC_HMAC state 
+   Initialize an HMAC context.
+   @param hmac     The HMAC state
    @param hash     The index of the hash you want to use 
    @param key      The secret key
    @param keylen   The length of the secret key (octets)
@@ -61,18 +59,16 @@ int hmac_init(hmac_state *hmac, int hash, const unsigned char *key, unsigned lon
         if ((err = hash_memory(hash, key, keylen, hmac->key, &z)) != CRYPT_OK) {
            goto LBL_ERR;
         }
-        if(hashsize < LTC_HMAC_BLOCKSIZE) {
-            zeromem((hmac->key) + hashsize, (size_t)(LTC_HMAC_BLOCKSIZE - hashsize));
-        }
         keylen = hashsize;
     } else {
         XMEMCPY(hmac->key, key, (size_t)keylen);
+    }
+
         if(keylen < LTC_HMAC_BLOCKSIZE) {
             zeromem((hmac->key) + keylen, (size_t)(LTC_HMAC_BLOCKSIZE - keylen));
         }
-    }
 
-    /* Create the initial vector for step (3) */
+    /* Create the initialization vector for step (3) */
     for(i=0; i < LTC_HMAC_BLOCKSIZE;   i++) {
        buf[i] = hmac->key[i] ^ 0x36;
     }
@@ -99,6 +95,6 @@ done:
 
 #endif
 
-/* $Source$ */
-/* $Revision$ */
-/* $Date$ */
+/* ref:         $Format:%D$ */
+/* git commit:  $Format:%H$ */
+/* commit time: $Format:%ai$ */
diff --git a/libtomcrypt/src/mac/hmac/hmac_memory.c b/libtomcrypt/src/mac/hmac/hmac_memory.c
index 9df80ea..9a3a199 100644
--- a/libtomcrypt/src/mac/hmac/hmac_memory.c
+++ b/libtomcrypt/src/mac/hmac/hmac_memory.c
@@ -5,32 +5,30 @@
  *
  * The library is free for all purposes without any express
  * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
  */
 #include "tomcrypt.h"
 
 /**
   @file hmac_memory.c
-  LTC_HMAC support, process a block of memory, Tom St Denis/Dobes Vandermeer
+  HMAC support, process a block of memory, Tom St Denis/Dobes Vandermeer
 */
 
 #ifdef LTC_HMAC
 
 /**
-   LTC_HMAC a block of memory to produce the authentication tag
-   @param hash      The index of the hash to use 
-   @param key       The secret key 
+   HMAC a block of memory to produce the authentication tag
+   @param hash      The index of the hash to use
+   @param key       The secret key
    @param keylen    The length of the secret key (octets)
-   @param in        The data to LTC_HMAC
-   @param inlen     The length of the data to LTC_HMAC (octets)
+   @param in        The data to HMAC
+   @param inlen     The length of the data to HMAC (octets)
    @param out       [out] Destination of the authentication tag
    @param outlen    [in/out] Max size and resulting size of authentication tag
    @return CRYPT_OK if successful
 */
-int hmac_memory(int hash, 
+int hmac_memory(int hash,
                 const unsigned char *key,  unsigned long keylen,
-                const unsigned char *in,   unsigned long inlen, 
+                const unsigned char *in,   unsigned long inlen,
                       unsigned char *out,  unsigned long *outlen)
 {
     hmac_state *hmac;
@@ -38,7 +36,7 @@ int hmac_memory(int hash,
 
     LTC_ARGCHK(key    != NULL);
     LTC_ARGCHK(in     != NULL);
-    LTC_ARGCHK(out    != NULL); 
+    LTC_ARGCHK(out    != NULL);
     LTC_ARGCHK(outlen != NULL);
 
     /* make sure hash descriptor is valid */
@@ -77,12 +75,12 @@ LBL_ERR:
 #endif
 
    XFREE(hmac);
-   return err;   
+   return err;
 }
 
 #endif
 
 
-/* $Source$ */
-/* $Revision$ */
-/* $Date$ */
+/* ref:         $Format:%D$ */
+/* git commit:  $Format:%H$ */
+/* commit time: $Format:%ai$ */
diff --git a/libtomcrypt/src/mac/hmac/hmac_memory_multi.c b/libtomcrypt/src/mac/hmac/hmac_memory_multi.c
index c3d461b..6e3d0fe 100644
--- a/libtomcrypt/src/mac/hmac/hmac_memory_multi.c
+++ b/libtomcrypt/src/mac/hmac/hmac_memory_multi.c
@@ -5,32 +5,30 @@
  *
  * The library is free for all purposes without any express
  * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
  */
 #include "tomcrypt.h"
 #include <stdarg.h>
 
 /**
   @file hmac_memory_multi.c
-  LTC_HMAC support, process multiple blocks of memory, Tom St Denis/Dobes Vandermeer
+  HMAC support, process multiple blocks of memory, Tom St Denis/Dobes Vandermeer
 */
 
 #ifdef LTC_HMAC
 
 /**
-   LTC_HMAC multiple blocks of memory to produce the authentication tag
-   @param hash      The index of the hash to use 
-   @param key       The secret key 
+   HMAC multiple blocks of memory to produce the authentication tag
+   @param hash      The index of the hash to use
+   @param key       The secret key
    @param keylen    The length of the secret key (octets)
    @param out       [out] Destination of the authentication tag
    @param outlen    [in/out] Max size and resulting size of authentication tag
-   @param in        The data to LTC_HMAC
-   @param inlen     The length of the data to LTC_HMAC (octets)
-   @param ...       tuples of (data,len) pairs to LTC_HMAC, terminated with a (NULL,x) (x=don't care)
+   @param in        The data to HMAC
+   @param inlen     The length of the data to HMAC (octets)
+   @param ...       tuples of (data,len) pairs to HMAC, terminated with a (NULL,x) (x=don't care)
    @return CRYPT_OK if successful
 */
-int hmac_memory_multi(int hash, 
+int hmac_memory_multi(int hash,
                 const unsigned char *key,  unsigned long keylen,
                       unsigned char *out,  unsigned long *outlen,
                 const unsigned char *in,   unsigned long inlen, ...)
@@ -44,7 +42,7 @@ int hmac_memory_multi(int hash,
 
     LTC_ARGCHK(key    != NULL);
     LTC_ARGCHK(in     != NULL);
-    LTC_ARGCHK(out    != NULL); 
+    LTC_ARGCHK(out    != NULL);
     LTC_ARGCHK(outlen != NULL);
 
     /* allocate ram for hmac state */
@@ -58,7 +56,7 @@ int hmac_memory_multi(int hash,
     }
 
     va_start(args, inlen);
-    curptr = in; 
+    curptr = in;
     curlen = inlen;
     for (;;) {
        /* process buf */
@@ -81,12 +79,12 @@ LBL_ERR:
 #endif
    XFREE(hmac);
    va_end(args);
-   return err;   
+   return err;
 }
 
 #endif
 
 
-/* $Source$ */
-/* $Revision$ */
-/* $Date$ */
+/* ref:         $Format:%D$ */
+/* git commit:  $Format:%H$ */
+/* commit time: $Format:%ai$ */
diff --git a/libtomcrypt/src/mac/hmac/hmac_process.c b/libtomcrypt/src/mac/hmac/hmac_process.c
index 802de1f..8da62c1 100644
--- a/libtomcrypt/src/mac/hmac/hmac_process.c
+++ b/libtomcrypt/src/mac/hmac/hmac_process.c
@@ -5,23 +5,21 @@
  *
  * The library is free for all purposes without any express
  * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
  */
 #include "tomcrypt.h"
 
 /**
   @file hmac_process.c
-  LTC_HMAC support, process data, Tom St Denis/Dobes Vandermeer
+  HMAC support, process data, Tom St Denis/Dobes Vandermeer
 */
 
 #ifdef LTC_HMAC
 
-/** 
-  Process data through LTC_HMAC
+/**
+  Process data through HMAC
   @param hmac    The hmac state
-  @param in      The data to send through LTC_HMAC
-  @param inlen   The length of the data to LTC_HMAC (octets)
+  @param in      The data to send through HMAC
+  @param inlen   The length of the data to HMAC (octets)
   @return CRYPT_OK if successful
 */
 int hmac_process(hmac_state *hmac, const unsigned char *in, unsigned long inlen)
@@ -38,6 +36,6 @@ int hmac_process(hmac_state *hmac, const unsigned char *in, unsigned long inlen)
 #endif
 
 
-/* $Source$ */
-/* $Revision$ */
-/* $Date$ */
+/* ref:         $Format:%D$ */
+/* git commit:  $Format:%H$ */
+/* commit time: $Format:%ai$ */
diff --git a/libtomcrypt/src/mac/hmac/hmac_test.c b/libtomcrypt/src/mac/hmac/hmac_test.c
index af43da6..1570a76 100644
--- a/libtomcrypt/src/mac/hmac/hmac_test.c
+++ b/libtomcrypt/src/mac/hmac/hmac_test.c
@@ -5,14 +5,12 @@
  *
  * The library is free for all purposes without any express
  * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
  */
 #include "tomcrypt.h"
 
 /**
   @file hmac_test.c
-  LTC_HMAC support, self-test, Tom St Denis/Dobes Vandermeer
+  HMAC support, self-test, Tom St Denis/Dobes Vandermeer/Steffen Jaeckel
 */
 
 #ifdef LTC_HMAC
@@ -27,239 +25,571 @@ Request for Comments: 2202                                          IBM
 Category: Informational                                        R. Glenn
                                                                    NIST
                                                          September 1997
-                 Test Cases for LTC_HMAC-LTC_MD5 and LTC_HMAC-LTC_SHA-1
+
+                 Test Cases for HMAC-MD5 and HMAC-SHA-1
+
+*******************************************************************************
+
+Network Working Group                                            J. Kapp
+Request for Comments: 2286                           Reaper Technologies
+Category: Informational                                    February 1998
+
+            Test Cases for HMAC-RIPEMD160 and HMAC-RIPEMD128
+
+*******************************************************************************
+
+Network Working Group                                         M. Nystrom
+Request for Comments: 4231                                  RSA Security
+Category: Standards Track                                  December 2005
+
+     Identifiers and Test Vectors for HMAC-SHA-224, HMAC-SHA-256,
+                     HMAC-SHA-384, and HMAC-SHA-512
 */
 
 /**
-  LTC_HMAC self-test
+  HMAC self-test
   @return CRYPT_OK if successful, CRYPT_NOP if tests have been disabled.
 */
 int hmac_test(void)
 {
  #ifndef LTC_TEST
     return CRYPT_NOP;
- #else    
+ #else
     unsigned char digest[MAXBLOCKSIZE];
     int i;
 
+    static const unsigned char hmac_test_case_keys[][136] = {
+        { /* 1 */
+            0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
+            0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
+            0x0b, 0x0b, 0x0b, 0x0b
+        },
+#ifdef LTC_TEST_EXT
+        { /* 2 */
+            0x4a, 0x65, 0x66, 0x65
+        },
+        { /* 4 */
+            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
+        },
+        { /* 5 */
+            0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c,
+            0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c,
+            0x0c, 0x0c, 0x0c, 0x0c
+        },
+        { /* 3, 6, 7 */
+            0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+            0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+            0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+            0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+            0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+
+            0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+            0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+            0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+            0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+            0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+
+            0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+            0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+            0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+            0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+            0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+
+            0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+            0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa
+        }
+#endif /* LTC_TEST_EXT */
+    };
+
+
+    static const unsigned char hmac_test_case_data[][153] = {
+        {
+            "Hi There"
+        },
+#ifdef LTC_TEST_EXT
+        {
+            "what do ya want for nothing?"
+        },
+        {
+            0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
+            0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
+            0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
+            0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
+            0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd
+        },
+        {
+            0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+            0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+            0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+            0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+            0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd
+        },
+        {
+            "Test With Truncation"
+        },
+        {
+            "Test Using Larger Than Block-Size Key - Hash Key First"
+        },
+        {
+            "Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data"
+        },
+        {
+            "This is a test using a larger than block-size key and a larger than block-size data. The key needs to be hashed before being used by the HMAC algorithm."
+        }
+#endif /* LTC_TEST_EXT */
+    };
+
     static const struct hmac_test_case {
-        int num;
-        char *algo;
-        unsigned char key[128];
+        const char *num;
+        const char *algo;
+        const unsigned char *key;
         unsigned long keylen;
-        unsigned char data[128];
+        const unsigned char *data;
         unsigned long datalen;
         unsigned char digest[MAXBLOCKSIZE];
     } cases[] = {
         /*
-        3. Test Cases for LTC_HMAC-LTC_SHA-1
-
-        test_case =     1
-        key =           0x0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c
-        key_len =       20
-        data =          "Hi Ther     20
-        digest =        0x4c1a03424b55e07fe7f27be1d58bb9324a9a5a04
-        digest-96 =     0x4c1a03424b55e07fe7f27be1
+        RFC 2202 3. Test Cases for HMAC-SHA-1
         */
-        { 5, "sha1",
-            {0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-             0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-             0x0c, 0x0c, 0x0c, 0x0c}, 20,
-            "Test With Truncation", 20,
+        { "rfc2202 3.1", "sha1",
+            hmac_test_case_keys[0], 20,
+            hmac_test_case_data[0], 8,
+            {0xb6, 0x17, 0x31, 0x86, 0x55, 0x05, 0x72, 0x64,
+             0xe2, 0x8b, 0xc0, 0xb6, 0xfb, 0x37, 0x8c, 0x8e,
+             0xf1, 0x46, 0xbe, 0x00} },
+
+#ifdef LTC_TEST_EXT
+        { "rfc2202 3.2", "sha1",
+            hmac_test_case_keys[1], 4,
+            hmac_test_case_data[1], 28,
+            {0xef, 0xfc, 0xdf, 0x6a, 0xe5, 0xeb, 0x2f, 0xa2,
+             0xd2, 0x74, 0x16, 0xd5, 0xf1, 0x84, 0xdf, 0x9c,
+             0x25, 0x9a, 0x7c, 0x79} },
+
+        { "rfc2202 3.3", "sha1",
+            hmac_test_case_keys[4], 20,
+            hmac_test_case_data[2], 50,
+            {0x12, 0x5d, 0x73, 0x42, 0xb9, 0xac, 0x11, 0xcd,
+             0x91, 0xa3, 0x9a, 0xf4, 0x8a, 0xa1, 0x7b, 0x4f,
+             0x63, 0xf1, 0x75, 0xd3} },
+
+        { "rfc2202 3.4", "sha1",
+            hmac_test_case_keys[2], 25,
+            hmac_test_case_data[3], 50,
+            {0x4c, 0x90, 0x07, 0xf4, 0x02, 0x62, 0x50, 0xc6,
+             0xbc, 0x84, 0x14, 0xf9, 0xbf, 0x50, 0xc8, 0x6c,
+             0x2d, 0x72, 0x35, 0xda} },
+
+        { "rfc2202 3.5", "sha1",
+            hmac_test_case_keys[3], 20,
+            hmac_test_case_data[4], 20,
             {0x4c, 0x1a, 0x03, 0x42, 0x4b, 0x55, 0xe0, 0x7f, 0xe7, 0xf2,
              0x7b, 0xe1, 0xd5, 0x8b, 0xb9, 0x32, 0x4a, 0x9a, 0x5a, 0x04} },
 
-        /*
-        test_case =     6
-        key =           0xaa repeated 80 times
-        key_len =       80
-        data =          "Test Using Larger Than Block-Size Key - Hash Key First"
-        data_len =      54
-        digest =        0xaa4ae5e15272d00e95705637ce8a3b55ed402112
-        */
-        { 6, "sha1",
-            {0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 
-             0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 
-             0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 
-             0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 
-             0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 
-             0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 
-             0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 
-             0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 
-             0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 
-             0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa}, 80,
-            "Test Using Larger Than Block-Size Key - Hash Key First", 54,
+        { "rfc2202 3.6", "sha1",
+            hmac_test_case_keys[4], 80,
+            hmac_test_case_data[5], 54,
             {0xaa, 0x4a, 0xe5, 0xe1, 0x52, 0x72, 0xd0, 0x0e,
-             0x95, 0x70, 0x56, 0x37, 0xce, 0x8a, 0x3b, 0x55, 
+             0x95, 0x70, 0x56, 0x37, 0xce, 0x8a, 0x3b, 0x55,
              0xed, 0x40, 0x21, 0x12} },
 
-        /*
-        test_case =     7
-        key =           0xaa repeated 80 times
-        key_len =       80
-        data =          "Test Using Larger Than Block-Size Key and Larger
-                        Than One Block-Size Data"
-        data_len =      73
-        digest =        0xe8e99d0f45237d786d6bbaa7965c7808bbff1a91
-        */
-        { 7, "sha1",
-            {0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-             0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-             0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-             0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-             0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-             0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-             0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-             0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-             0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-             0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa}, 80,
-            "Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data", 73,
+        { "rfc2202 3.7", "sha1",
+            hmac_test_case_keys[4], 80,
+           hmac_test_case_data[6], 73,
             {0xe8, 0xe9, 0x9d, 0x0f, 0x45, 0x23, 0x7d, 0x78, 0x6d,
              0x6b, 0xba, 0xa7, 0x96, 0x5c, 0x78, 0x08, 0xbb, 0xff, 0x1a, 0x91} },
+#endif /* LTC_TEST_EXT */
 
         /*
-        2. Test Cases for LTC_HMAC-LTC_MD5
-
-        test_case =     1
-        key =           0x0b 0b 0b 0b 
-                          0b 0b 0b 0b
-                          0b 0b 0b 0b
-                          0b 0b 0b 0b
-        key_len =       16
-        data =          "Hi There"
-        data_len =      8
-        digest =        0x92 94 72 7a 
-                          36 38 bb 1c 
-                          13 f4 8e f8 
-                          15 8b fc 9d
+        RFC 2202 2. Test Cases for HMAC-MD5
         */
-        { 1, "md5",
-            {0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 
-             0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b}, 16,
-            "Hi There", 8,
-            {0x92, 0x94, 0x72, 0x7a, 0x36, 0x38, 0xbb, 0x1c, 
+        { "rfc2202 2.1", "md5",
+            hmac_test_case_keys[0], 16,
+            hmac_test_case_data[0], 8,
+            {0x92, 0x94, 0x72, 0x7a, 0x36, 0x38, 0xbb, 0x1c,
              0x13, 0xf4, 0x8e, 0xf8, 0x15, 0x8b, 0xfc, 0x9d}  },
-        /*
-        test_case =     2
-        key =           "Jefe"
-        key_len =       4
-        data =          "what do ya want for nothing?"
-        data_len =      28
-        digest =        0x750c783e6ab0b503eaa86e310a5db738
-        */
-        { 2, "md5",
-            "Jefe", 4,
-            "what do ya want for nothing?", 28,
-            {0x75, 0x0c, 0x78, 0x3e, 0x6a, 0xb0, 0xb5, 0x03, 
+
+#ifdef LTC_TEST_EXT
+        { "rfc2202 2.2", "md5",
+            hmac_test_case_keys[1], 4,
+            hmac_test_case_data[1], 28,
+            {0x75, 0x0c, 0x78, 0x3e, 0x6a, 0xb0, 0xb5, 0x03,
              0xea, 0xa8, 0x6e, 0x31, 0x0a, 0x5d, 0xb7, 0x38} },
 
-        /*
-        test_case =     3
-        key =           0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-        key_len         16
-        data =          0xdd repeated 50 times
-        data_len =      50
-        digest =        0x56be34521d144c88dbb8c733f0e8b3f6
-        */
-        { 3, "md5",
-            {0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 
-             0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa}, 16,
-            {0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
-             0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
-             0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
-             0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
-             0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd}, 50,
+        { "rfc2202 2.3", "md5",
+            hmac_test_case_keys[4], 16,
+            hmac_test_case_data[2], 50,
             {0x56, 0xbe, 0x34, 0x52, 0x1d, 0x14, 0x4c, 0x88,
              0xdb, 0xb8, 0xc7, 0x33, 0xf0, 0xe8, 0xb3, 0xf6} },
-        /*
 
-        test_case =     4
-        key = 0x0102030405060708090a0b0c0d0e0f10111213141516171819
-        key_len         25
-        data =          0xcd repeated 50 times
-        data_len =      50
-        digest =        0x697eaf0aca3a3aea3a75164746ffaa79
-        */
-        { 4, "md5",
-            {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}, 25,
-            {0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
-             0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
-             0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
-             0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
-             0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd}, 50,
-            {0x69, 0x7e, 0xaf, 0x0a, 0xca, 0x3a, 0x3a, 0xea, 
+        { "rfc2202 2.4", "md5",
+            hmac_test_case_keys[2], 25,
+            hmac_test_case_data[3], 50,
+            {0x69, 0x7e, 0xaf, 0x0a, 0xca, 0x3a, 0x3a, 0xea,
              0x3a, 0x75, 0x16, 0x47, 0x46, 0xff, 0xaa, 0x79} },
 
+        { "rfc2202 2.5", "md5",
+            hmac_test_case_keys[3], 16,
+            hmac_test_case_data[4], 20,
+            {0x56, 0x46, 0x1e, 0xf2, 0x34, 0x2e, 0xdc, 0x00,
+             0xf9, 0xba, 0xb9, 0x95, 0x69, 0x0e, 0xfd, 0x4c} },
+
+        { "rfc2202 2.6", "md5",
+            hmac_test_case_keys[4], 80,
+            hmac_test_case_data[5], 54,
+            {0x6b, 0x1a, 0xb7, 0xfe, 0x4b, 0xd7, 0xbf, 0x8f,
+             0x0b, 0x62, 0xe6, 0xce, 0x61, 0xb9, 0xd0, 0xcd} },
+
+        { "rfc2202 2.7", "md5",
+            hmac_test_case_keys[4], 80,
+           hmac_test_case_data[6], 73,
+            {0x6f, 0x63, 0x0f, 0xad, 0x67, 0xcd, 0xa0, 0xee,
+             0x1f, 0xb1, 0xf5, 0x62, 0xdb, 0x3a, 0xa5, 0x3e} },
+#endif /* LTC_TEST_EXT */
 
         /*
- 
-        test_case =     5
-        key =           0x0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c
-        key_len =       16
-        data =          "Test With Truncation"
-        data_len =      20
-        digest =        0x56461ef2342edc00f9bab995690efd4c
-        digest-96       0x56461ef2342edc00f9bab995
+        RFC 2286 2. Test Cases for HMAC-RIPEMD160
         */
-        { 5, "md5",
-            {0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-             0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c}, 16,
-            "Test With Truncation", 20,
-            {0x56, 0x46, 0x1e, 0xf2, 0x34, 0x2e, 0xdc, 0x00, 
-             0xf9, 0xba, 0xb9, 0x95, 0x69, 0x0e, 0xfd, 0x4c} },
+        { "rfc2286 2.1", "rmd160",
+            hmac_test_case_keys[0], 20,
+            hmac_test_case_data[0], 8,
+            {0x24, 0xcb, 0x4b, 0xd6, 0x7d, 0x20, 0xfc, 0x1a,
+             0x5d, 0x2e, 0xd7, 0x73, 0x2d, 0xcc, 0x39, 0x37,
+             0x7f, 0x0a, 0x56, 0x68} },
 
-        /*
+#ifdef LTC_TEST_EXT
+        { "rfc2286 2.2", "rmd160",
+            hmac_test_case_keys[1], 4,
+            hmac_test_case_data[1], 28,
+            {0xdd, 0xa6, 0xc0, 0x21, 0x3a, 0x48, 0x5a, 0x9e,
+             0x24, 0xf4, 0x74, 0x20, 0x64, 0xa7, 0xf0, 0x33,
+             0xb4, 0x3c, 0x40, 0x69} },
 
-        test_case =     6
-        key =           0xaa repeated 80 times
-        key_len =       80
-        data =          "Test Using Larger Than Block-Size Key - Hash 
-Key First"
-        data_len =      54
-        digest =        0x6b1ab7fe4bd7bf8f0b62e6ce61b9d0cd
-        */
-        { 6, "md5",
-            {0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 
-             0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 
-             0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 
-             0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 
-             0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-             
-             0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 
-             0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 
-             0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 
-             0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 
-             0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa}, 80,
-            "Test Using Larger Than Block-Size Key - Hash Key First", 54,
-            {0x6b, 0x1a, 0xb7, 0xfe, 0x4b, 0xd7, 0xbf, 0x8f, 
-             0x0b, 0x62, 0xe6, 0xce, 0x61, 0xb9, 0xd0, 0xcd} },
+        { "rfc2286 2.3", "rmd160",
+            hmac_test_case_keys[4], 20,
+            hmac_test_case_data[2], 50,
+            {0xb0, 0xb1, 0x05, 0x36, 0x0d, 0xe7, 0x59, 0x96,
+             0x0a, 0xb4, 0xf3, 0x52, 0x98, 0xe1, 0x16, 0xe2,
+             0x95, 0xd8, 0xe7, 0xc1} },
+
+        { "rfc2286 2.4", "rmd160",
+            hmac_test_case_keys[2], 25,
+            hmac_test_case_data[3], 50,
+            {0xd5, 0xca, 0x86, 0x2f, 0x4d, 0x21, 0xd5, 0xe6,
+             0x10, 0xe1, 0x8b, 0x4c, 0xf1, 0xbe, 0xb9, 0x7a,
+             0x43, 0x65, 0xec, 0xf4} },
+
+        { "rfc2286 2.5", "rmd160",
+            hmac_test_case_keys[3], 20,
+            hmac_test_case_data[4], 20,
+            {0x76, 0x19, 0x69, 0x39, 0x78, 0xf9, 0x1d, 0x90,
+             0x53, 0x9a, 0xe7, 0x86, 0x50, 0x0f, 0xf3, 0xd8,
+             0xe0, 0x51, 0x8e, 0x39} },
+
+        { "rfc2286 2.6", "rmd160",
+            hmac_test_case_keys[4], 80,
+            hmac_test_case_data[5], 54,
+            {0x64, 0x66, 0xca, 0x07, 0xac, 0x5e, 0xac, 0x29,
+             0xe1, 0xbd, 0x52, 0x3e, 0x5a, 0xda, 0x76, 0x05,
+             0xb7, 0x91, 0xfd, 0x8b} },
+
+        { "rfc2286 2.7", "rmd160",
+            hmac_test_case_keys[4], 80,
+            hmac_test_case_data[6], 73,
+            {0x69, 0xea, 0x60, 0x79, 0x8d, 0x71, 0x61, 0x6c,
+             0xce, 0x5f, 0xd0, 0x87, 0x1e, 0x23, 0x75, 0x4c,
+             0xd7, 0x5d, 0x5a, 0x0a} },
+#endif /* LTC_TEST_EXT */
 
         /*
+        RFC 2286 3. Test Cases for HMAC-RIPEMD128
+        */
+        { "rfc2286 3.1", "rmd128",
+            hmac_test_case_keys[0], 16,
+            hmac_test_case_data[0], 8,
+            {0xfb, 0xf6, 0x1f, 0x94, 0x92, 0xaa, 0x4b, 0xbf,
+             0x81, 0xc1, 0x72, 0xe8, 0x4e, 0x07, 0x34, 0xdb} },
+
+#ifdef LTC_TEST_EXT
+        { "rfc2286 3.2", "rmd128",
+            hmac_test_case_keys[1], 4,
+            hmac_test_case_data[1], 28,
+            {0x87, 0x5f, 0x82, 0x88, 0x62, 0xb6, 0xb3, 0x34,
+             0xb4, 0x27, 0xc5, 0x5f, 0x9f, 0x7f, 0xf0, 0x9b} },
+
+        { "rfc2286 3.3", "rmd128",
+            hmac_test_case_keys[4], 16,
+            hmac_test_case_data[2], 50,
+            {0x09, 0xf0, 0xb2, 0x84, 0x6d, 0x2f, 0x54, 0x3d,
+             0xa3, 0x63, 0xcb, 0xec, 0x8d, 0x62, 0xa3, 0x8d} },
+
+        { "rfc2286 3.4", "rmd128",
+            hmac_test_case_keys[2], 25,
+            hmac_test_case_data[3], 50,
+            {0xbd, 0xbb, 0xd7, 0xcf, 0x03, 0xe4, 0x4b, 0x5a,
+             0xa6, 0x0a, 0xf8, 0x15, 0xbe, 0x4d, 0x22, 0x94} },
 
-        test_case =     7
-        key =           0xaa repeated 80 times
-        key_len =       80
-        data =          "Test Using Larger Than Block-Size Key and Larger
-                        Than One Block-Size Data"
-        data_len =      73
-        digest =        0x6f630fad67cda0ee1fb1f562db3aa53e
+        { "rfc2286 3.5", "rmd128",
+            hmac_test_case_keys[3], 16,
+            hmac_test_case_data[4], 20,
+            {0xe7, 0x98, 0x08, 0xf2, 0x4b, 0x25, 0xfd, 0x03,
+             0x1c, 0x15, 0x5f, 0x0d, 0x55, 0x1d, 0x9a, 0x3a} },
+
+        { "rfc2286 3.6", "rmd128",
+            hmac_test_case_keys[4], 80,
+            hmac_test_case_data[5], 54,
+            {0xdc, 0x73, 0x29, 0x28, 0xde, 0x98, 0x10, 0x4a,
+             0x1f, 0x59, 0xd3, 0x73, 0xc1, 0x50, 0xac, 0xbb} },
+
+        { "rfc2286 3.7", "rmd128",
+            hmac_test_case_keys[4], 80,
+            hmac_test_case_data[6], 73,
+            {0x5c, 0x6b, 0xec, 0x96, 0x79, 0x3e, 0x16, 0xd4,
+             0x06, 0x90, 0xc2, 0x37, 0x63, 0x5f, 0x30, 0xc5} },
+#endif /* LTC_TEST_EXT */
+
+        /*
+        RFC 4231 4. Test Vectors
+        Ch. 4.6 with truncated output left out to simplify tests
         */
-        { 7, "md5",
-            {0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-             0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-             0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-             0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-             0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-             0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 
-             0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 
-             0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-             0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-             0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa}, 80,
-            "Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data", 73,
-            {0x6f, 0x63, 0x0f, 0xad, 0x67, 0xcd, 0xa0, 0xee,
-             0x1f, 0xb1, 0xf5, 0x62, 0xdb, 0x3a, 0xa5, 0x3e} }
+        { "rfc4231 4.2", "sha224",
+            hmac_test_case_keys[0], 20,
+            hmac_test_case_data[0], 8,
+            {0x89, 0x6f, 0xb1, 0x12, 0x8a, 0xbb, 0xdf, 0x19,
+             0x68, 0x32, 0x10, 0x7c, 0xd4, 0x9d, 0xf3, 0x3f,
+             0x47, 0xb4, 0xb1, 0x16, 0x99, 0x12, 0xba, 0x4f,
+             0x53, 0x68, 0x4b, 0x22} },
+
+#ifdef LTC_TEST_EXT
+        { "rfc4231 4.3", "sha224",
+            hmac_test_case_keys[1], 4,
+            hmac_test_case_data[1], 28,
+            {0xa3, 0x0e, 0x01, 0x09, 0x8b, 0xc6, 0xdb, 0xbf,
+             0x45, 0x69, 0x0f, 0x3a, 0x7e, 0x9e, 0x6d, 0x0f,
+             0x8b, 0xbe, 0xa2, 0xa3, 0x9e, 0x61, 0x48, 0x00,
+             0x8f, 0xd0, 0x5e, 0x44} },
+
+        { "rfc4231 4.4", "sha224",
+            hmac_test_case_keys[4], 20,
+            hmac_test_case_data[2], 50,
+            {0x7f, 0xb3, 0xcb, 0x35, 0x88, 0xc6, 0xc1, 0xf6,
+             0xff, 0xa9, 0x69, 0x4d, 0x7d, 0x6a, 0xd2, 0x64,
+             0x93, 0x65, 0xb0, 0xc1, 0xf6, 0x5d, 0x69, 0xd1,
+             0xec, 0x83, 0x33, 0xea} },
+
+        { "rfc4231 4.5", "sha224",
+            hmac_test_case_keys[2], 25,
+            hmac_test_case_data[3], 50,
+            {0x6c, 0x11, 0x50, 0x68, 0x74, 0x01, 0x3c, 0xac,
+             0x6a, 0x2a, 0xbc, 0x1b, 0xb3, 0x82, 0x62, 0x7c,
+             0xec, 0x6a, 0x90, 0xd8, 0x6e, 0xfc, 0x01, 0x2d,
+             0xe7, 0xaf, 0xec, 0x5a} },
+
+        { "rfc4231 4.7", "sha224",
+            hmac_test_case_keys[4], 131,
+            hmac_test_case_data[5], 54,
+            {0x95, 0xe9, 0xa0, 0xdb, 0x96, 0x20, 0x95, 0xad,
+             0xae, 0xbe, 0x9b, 0x2d, 0x6f, 0x0d, 0xbc, 0xe2,
+             0xd4, 0x99, 0xf1, 0x12, 0xf2, 0xd2, 0xb7, 0x27,
+             0x3f, 0xa6, 0x87, 0x0e} },
+
+        { "rfc4231 4.8", "sha224",
+            hmac_test_case_keys[4], 131,
+            hmac_test_case_data[7], 152,
+            {0x3a, 0x85, 0x41, 0x66, 0xac, 0x5d, 0x9f, 0x02,
+             0x3f, 0x54, 0xd5, 0x17, 0xd0, 0xb3, 0x9d, 0xbd,
+             0x94, 0x67, 0x70, 0xdb, 0x9c, 0x2b, 0x95, 0xc9,
+             0xf6, 0xf5, 0x65, 0xd1} },
+#endif /* LTC_TEST_EXT */
+
+        { "rfc4231 4.2", "sha256",
+            hmac_test_case_keys[0], 20,
+            hmac_test_case_data[0], 8,
+            {0xb0, 0x34, 0x4c, 0x61, 0xd8, 0xdb, 0x38, 0x53,
+             0x5c, 0xa8, 0xaf, 0xce, 0xaf, 0x0b, 0xf1, 0x2b,
+             0x88, 0x1d, 0xc2, 0x00, 0xc9, 0x83, 0x3d, 0xa7,
+             0x26, 0xe9, 0x37, 0x6c, 0x2e, 0x32, 0xcf, 0xf7} },
+
+#ifdef LTC_TEST_EXT
+        { "rfc4231 4.3", "sha256",
+            hmac_test_case_keys[1], 4,
+            hmac_test_case_data[1], 28,
+            {0x5b, 0xdc, 0xc1, 0x46, 0xbf, 0x60, 0x75, 0x4e,
+             0x6a, 0x04, 0x24, 0x26, 0x08, 0x95, 0x75, 0xc7,
+             0x5a, 0x00, 0x3f, 0x08, 0x9d, 0x27, 0x39, 0x83,
+             0x9d, 0xec, 0x58, 0xb9, 0x64, 0xec, 0x38, 0x43} },
+
+        { "rfc4231 4.4", "sha256",
+            hmac_test_case_keys[4], 20,
+            hmac_test_case_data[2], 50,
+            {0x77, 0x3e, 0xa9, 0x1e, 0x36, 0x80, 0x0e, 0x46,
+             0x85, 0x4d, 0xb8, 0xeb, 0xd0, 0x91, 0x81, 0xa7,
+             0x29, 0x59, 0x09, 0x8b, 0x3e, 0xf8, 0xc1, 0x22,
+             0xd9, 0x63, 0x55, 0x14, 0xce, 0xd5, 0x65, 0xfe} },
+
+        { "rfc4231 4.5", "sha256",
+            hmac_test_case_keys[2], 25,
+            hmac_test_case_data[3], 50,
+            {0x82, 0x55, 0x8a, 0x38, 0x9a, 0x44, 0x3c, 0x0e,
+             0xa4, 0xcc, 0x81, 0x98, 0x99, 0xf2, 0x08, 0x3a,
+             0x85, 0xf0, 0xfa, 0xa3, 0xe5, 0x78, 0xf8, 0x07,
+             0x7a, 0x2e, 0x3f, 0xf4, 0x67, 0x29, 0x66, 0x5b} },
+
+        { "rfc4231 4.7", "sha256",
+            hmac_test_case_keys[4], 131,
+            hmac_test_case_data[5], 54,
+            {0x60, 0xe4, 0x31, 0x59, 0x1e, 0xe0, 0xb6, 0x7f,
+             0x0d, 0x8a, 0x26, 0xaa, 0xcb, 0xf5, 0xb7, 0x7f,
+             0x8e, 0x0b, 0xc6, 0x21, 0x37, 0x28, 0xc5, 0x14,
+             0x05, 0x46, 0x04, 0x0f, 0x0e, 0xe3, 0x7f, 0x54} },
+
+        { "rfc4231 4.8", "sha256",
+            hmac_test_case_keys[4], 131,
+            hmac_test_case_data[7], 152,
+            {0x9b, 0x09, 0xff, 0xa7, 0x1b, 0x94, 0x2f, 0xcb,
+             0x27, 0x63, 0x5f, 0xbc, 0xd5, 0xb0, 0xe9, 0x44,
+             0xbf, 0xdc, 0x63, 0x64, 0x4f, 0x07, 0x13, 0x93,
+             0x8a, 0x7f, 0x51, 0x53, 0x5c, 0x3a, 0x35, 0xe2} },
+#endif /* LTC_TEST_EXT */
+
+        { "rfc4231 4.2", "sha384",
+            hmac_test_case_keys[0], 20,
+            hmac_test_case_data[0], 8,
+            {0xaf, 0xd0, 0x39, 0x44, 0xd8, 0x48, 0x95, 0x62,
+             0x6b, 0x08, 0x25, 0xf4, 0xab, 0x46, 0x90, 0x7f,
+             0x15, 0xf9, 0xda, 0xdb, 0xe4, 0x10, 0x1e, 0xc6,
+             0x82, 0xaa, 0x03, 0x4c, 0x7c, 0xeb, 0xc5, 0x9c,
+             0xfa, 0xea, 0x9e, 0xa9, 0x07, 0x6e, 0xde, 0x7f,
+             0x4a, 0xf1, 0x52, 0xe8, 0xb2, 0xfa, 0x9c, 0xb6} },
+
+#ifdef LTC_TEST_EXT
+        { "rfc4231 4.3", "sha384",
+            hmac_test_case_keys[1], 4,
+            hmac_test_case_data[1], 28,
+            {0xaf, 0x45, 0xd2, 0xe3, 0x76, 0x48, 0x40, 0x31,
+             0x61, 0x7f, 0x78, 0xd2, 0xb5, 0x8a, 0x6b, 0x1b,
+             0x9c, 0x7e, 0xf4, 0x64, 0xf5, 0xa0, 0x1b, 0x47,
+             0xe4, 0x2e, 0xc3, 0x73, 0x63, 0x22, 0x44, 0x5e,
+             0x8e, 0x22, 0x40, 0xca, 0x5e, 0x69, 0xe2, 0xc7,
+             0x8b, 0x32, 0x39, 0xec, 0xfa, 0xb2, 0x16, 0x49} },
+
+        { "rfc4231 4.4", "sha384",
+            hmac_test_case_keys[4], 20,
+            hmac_test_case_data[2], 50,
+            {0x88, 0x06, 0x26, 0x08, 0xd3, 0xe6, 0xad, 0x8a,
+             0x0a, 0xa2, 0xac, 0xe0, 0x14, 0xc8, 0xa8, 0x6f,
+             0x0a, 0xa6, 0x35, 0xd9, 0x47, 0xac, 0x9f, 0xeb,
+             0xe8, 0x3e, 0xf4, 0xe5, 0x59, 0x66, 0x14, 0x4b,
+             0x2a, 0x5a, 0xb3, 0x9d, 0xc1, 0x38, 0x14, 0xb9,
+             0x4e, 0x3a, 0xb6, 0xe1, 0x01, 0xa3, 0x4f, 0x27} },
+
+        { "rfc4231 4.5", "sha384",
+            hmac_test_case_keys[2], 25,
+            hmac_test_case_data[3], 50,
+            {0x3e, 0x8a, 0x69, 0xb7, 0x78, 0x3c, 0x25, 0x85,
+             0x19, 0x33, 0xab, 0x62, 0x90, 0xaf, 0x6c, 0xa7,
+             0x7a, 0x99, 0x81, 0x48, 0x08, 0x50, 0x00, 0x9c,
+             0xc5, 0x57, 0x7c, 0x6e, 0x1f, 0x57, 0x3b, 0x4e,
+             0x68, 0x01, 0xdd, 0x23, 0xc4, 0xa7, 0xd6, 0x79,
+             0xcc, 0xf8, 0xa3, 0x86, 0xc6, 0x74, 0xcf, 0xfb} },
+
+        { "rfc4231 4.7", "sha384",
+            hmac_test_case_keys[4], 131,
+            hmac_test_case_data[5], 54,
+            {0x4e, 0xce, 0x08, 0x44, 0x85, 0x81, 0x3e, 0x90,
+             0x88, 0xd2, 0xc6, 0x3a, 0x04, 0x1b, 0xc5, 0xb4,
+             0x4f, 0x9e, 0xf1, 0x01, 0x2a, 0x2b, 0x58, 0x8f,
+             0x3c, 0xd1, 0x1f, 0x05, 0x03, 0x3a, 0xc4, 0xc6,
+             0x0c, 0x2e, 0xf6, 0xab, 0x40, 0x30, 0xfe, 0x82,
+             0x96, 0x24, 0x8d, 0xf1, 0x63, 0xf4, 0x49, 0x52} },
+
+        { "rfc4231 4.8", "sha384",
+            hmac_test_case_keys[4], 131,
+            hmac_test_case_data[7], 152,
+            {0x66, 0x17, 0x17, 0x8e, 0x94, 0x1f, 0x02, 0x0d,
+             0x35, 0x1e, 0x2f, 0x25, 0x4e, 0x8f, 0xd3, 0x2c,
+             0x60, 0x24, 0x20, 0xfe, 0xb0, 0xb8, 0xfb, 0x9a,
+             0xdc, 0xce, 0xbb, 0x82, 0x46, 0x1e, 0x99, 0xc5,
+             0xa6, 0x78, 0xcc, 0x31, 0xe7, 0x99, 0x17, 0x6d,
+             0x38, 0x60, 0xe6, 0x11, 0x0c, 0x46, 0x52, 0x3e} },
+#endif /* LTC_TEST_EXT */
+
+        { "rfc4231 4.2", "sha512",
+            hmac_test_case_keys[0], 20,
+            hmac_test_case_data[0], 8,
+            {0x87, 0xaa, 0x7c, 0xde, 0xa5, 0xef, 0x61, 0x9d,
+             0x4f, 0xf0, 0xb4, 0x24, 0x1a, 0x1d, 0x6c, 0xb0,
+             0x23, 0x79, 0xf4, 0xe2, 0xce, 0x4e, 0xc2, 0x78,
+             0x7a, 0xd0, 0xb3, 0x05, 0x45, 0xe1, 0x7c, 0xde,
+             0xda, 0xa8, 0x33, 0xb7, 0xd6, 0xb8, 0xa7, 0x02,
+             0x03, 0x8b, 0x27, 0x4e, 0xae, 0xa3, 0xf4, 0xe4,
+             0xbe, 0x9d, 0x91, 0x4e, 0xeb, 0x61, 0xf1, 0x70,
+             0x2e, 0x69, 0x6c, 0x20, 0x3a, 0x12, 0x68, 0x54} },
+
+#ifdef LTC_TEST_EXT
+        { "rfc4231 4.3", "sha512",
+            hmac_test_case_keys[1], 4,
+            hmac_test_case_data[1], 28,
+            {0x16, 0x4b, 0x7a, 0x7b, 0xfc, 0xf8, 0x19, 0xe2,
+             0xe3, 0x95, 0xfb, 0xe7, 0x3b, 0x56, 0xe0, 0xa3,
+             0x87, 0xbd, 0x64, 0x22, 0x2e, 0x83, 0x1f, 0xd6,
+             0x10, 0x27, 0x0c, 0xd7, 0xea, 0x25, 0x05, 0x54,
+             0x97, 0x58, 0xbf, 0x75, 0xc0, 0x5a, 0x99, 0x4a,
+             0x6d, 0x03, 0x4f, 0x65, 0xf8, 0xf0, 0xe6, 0xfd,
+             0xca, 0xea, 0xb1, 0xa3, 0x4d, 0x4a, 0x6b, 0x4b,
+             0x63, 0x6e, 0x07, 0x0a, 0x38, 0xbc, 0xe7, 0x37} },
+
+        { "rfc4231 4.4", "sha512",
+            hmac_test_case_keys[4], 20,
+            hmac_test_case_data[2], 50,
+            {0xfa, 0x73, 0xb0, 0x08, 0x9d, 0x56, 0xa2, 0x84,
+             0xef, 0xb0, 0xf0, 0x75, 0x6c, 0x89, 0x0b, 0xe9,
+             0xb1, 0xb5, 0xdb, 0xdd, 0x8e, 0xe8, 0x1a, 0x36,
+             0x55, 0xf8, 0x3e, 0x33, 0xb2, 0x27, 0x9d, 0x39,
+             0xbf, 0x3e, 0x84, 0x82, 0x79, 0xa7, 0x22, 0xc8,
+             0x06, 0xb4, 0x85, 0xa4, 0x7e, 0x67, 0xc8, 0x07,
+             0xb9, 0x46, 0xa3, 0x37, 0xbe, 0xe8, 0x94, 0x26,
+             0x74, 0x27, 0x88, 0x59, 0xe1, 0x32, 0x92, 0xfb} },
+
+        { "rfc4231 4.5", "sha512",
+            hmac_test_case_keys[2], 25,
+            hmac_test_case_data[3], 50,
+            {0xb0, 0xba, 0x46, 0x56, 0x37, 0x45, 0x8c, 0x69,
+             0x90, 0xe5, 0xa8, 0xc5, 0xf6, 0x1d, 0x4a, 0xf7,
+             0xe5, 0x76, 0xd9, 0x7f, 0xf9, 0x4b, 0x87, 0x2d,
+             0xe7, 0x6f, 0x80, 0x50, 0x36, 0x1e, 0xe3, 0xdb,
+             0xa9, 0x1c, 0xa5, 0xc1, 0x1a, 0xa2, 0x5e, 0xb4,
+             0xd6, 0x79, 0x27, 0x5c, 0xc5, 0x78, 0x80, 0x63,
+             0xa5, 0xf1, 0x97, 0x41, 0x12, 0x0c, 0x4f, 0x2d,
+             0xe2, 0xad, 0xeb, 0xeb, 0x10, 0xa2, 0x98, 0xdd} },
+
+        { "rfc4231 4.7", "sha512",
+            hmac_test_case_keys[4], 131,
+            hmac_test_case_data[5], 54,
+            {0x80, 0xb2, 0x42, 0x63, 0xc7, 0xc1, 0xa3, 0xeb,
+             0xb7, 0x14, 0x93, 0xc1, 0xdd, 0x7b, 0xe8, 0xb4,
+             0x9b, 0x46, 0xd1, 0xf4, 0x1b, 0x4a, 0xee, 0xc1,
+             0x12, 0x1b, 0x01, 0x37, 0x83, 0xf8, 0xf3, 0x52,
+             0x6b, 0x56, 0xd0, 0x37, 0xe0, 0x5f, 0x25, 0x98,
+             0xbd, 0x0f, 0xd2, 0x21, 0x5d, 0x6a, 0x1e, 0x52,
+             0x95, 0xe6, 0x4f, 0x73, 0xf6, 0x3f, 0x0a, 0xec,
+             0x8b, 0x91, 0x5a, 0x98, 0x5d, 0x78, 0x65, 0x98} },
+
+        { "rfc4231 4.8", "sha512",
+            hmac_test_case_keys[4], 131,
+            hmac_test_case_data[7], 152,
+            {0xe3, 0x7b, 0x6a, 0x77, 0x5d, 0xc8, 0x7d, 0xba,
+             0xa4, 0xdf, 0xa9, 0xf9, 0x6e, 0x5e, 0x3f, 0xfd,
+             0xde, 0xbd, 0x71, 0xf8, 0x86, 0x72, 0x89, 0x86,
+             0x5d, 0xf5, 0xa3, 0x2d, 0x20, 0xcd, 0xc9, 0x44,
+             0xb6, 0x02, 0x2c, 0xac, 0x3c, 0x49, 0x82, 0xb1,
+             0x0d, 0x5e, 0xeb, 0x55, 0xc3, 0xe4, 0xde, 0x15,
+             0x13, 0x46, 0x76, 0xfb, 0x6d, 0xe0, 0x44, 0x60,
+             0x65, 0xc9, 0x74, 0x40, 0xfa, 0x8c, 0x6a, 0x58} },
+#endif /* LTC_TEST_EXT */
+
     };
 
     unsigned long outlen;
@@ -271,30 +601,14 @@ Key First"
         ++tested;
         outlen = sizeof(digest);
         if((err = hmac_memory(hash, cases[i].key, cases[i].keylen, cases[i].data, cases[i].datalen, digest, &outlen)) != CRYPT_OK) {
-#if 0
-            printf("LTC_HMAC-%s test #%d, %s\n", cases[i].algo, cases[i].num, error_to_string(err));
+#ifdef LTC_TEST_DBG
+            printf("HMAC-%s test %s, %s\n", cases[i].algo, cases[i].num, error_to_string(err));
 #endif
             return err;
         }
 
-        if(XMEMCMP(digest, cases[i].digest, (size_t)hash_descriptor[hash].hashsize) != 0)  {
+        if(compare_testvector(digest, outlen, cases[i].digest, (size_t)hash_descriptor[hash].hashsize, cases[i].num, i)) {
             failed++;
-#if 0
-            unsigned int j;
-            printf("\nLTC_HMAC-%s test #%d:\n", cases[i].algo, cases[i].num);
-            printf(  "Result:  0x");
-            for(j=0; j < hash_descriptor[hash].hashsize; j++) {
-                printf("%2x ", digest[j]);
-            }
-            printf("\nCorrect: 0x");
-            for(j=0; j < hash_descriptor[hash].hashsize; j++) {
-               printf("%2x ", cases[i].digest[j]);
-            }
-            printf("\n");
-            return CRYPT_ERROR;
-#endif
-        } else {
-            /* printf("LTC_HMAC-%s test #%d: Passed\n", cases[i].algo, cases[i].num); */
         }
     }
 
@@ -311,6 +625,6 @@ Key First"
 #endif
 
 
-/* $Source$ */
-/* $Revision$ */
-/* $Date$ */
+/* ref:         $Format:%D$ */
+/* git commit:  $Format:%H$ */
+/* commit time: $Format:%ai$ */