macpi hmac with tests

mcapi/crypto.c

@@ -30,6 +30,7 @@
 #include <cyassl/ctaocrypt/sha.h>
 #include <cyassl/ctaocrypt/sha256.h>
 #include <cyassl/ctaocrypt/sha512.h>
+#include <cyassl/ctaocrypt/hmac.h>
 
 
 /* Initialize MD5 */
@@ -187,3 +188,39 @@ int CRYPT_SHA512_Finalize(CRYPT_SHA512_CTX* sha512, unsigned char* digest)
 }
 
 
+/* Set HMAC key with type */
+int CRYPT_HMAC_SetKey(CRYPT_HMAC_CTX* hmac, int type, const unsigned char* key,
+                      unsigned int sz)
+{
+    typedef char hmac_test[sizeof(CRYPT_HMAC_CTX) >= sizeof(Hmac) ? 1 : -1];
+    (void)sizeof(hmac_test);
+
+    if (type != CRYPT_HMAC_SHA && type != CRYPT_HMAC_SHA256 &&
+        type != CRYPT_HMAC_SHA384 && type != CRYPT_HMAC_SHA512) {
+        return -1;  /* bad hmac type */
+    }
+
+    HmacSetKey((Hmac*)hmac, type, key, sz);
+
+    return 0;
+}
+
+
+int CRYPT_HMAC_DataAdd(CRYPT_HMAC_CTX* hmac, const unsigned char* input,
+                       unsigned int sz)
+{
+    HmacUpdate((Hmac*)hmac, input, sz);
+
+    return 0;
+}
+
+
+/* Get HMAC Final into digest */
+int CRYPT_HMAC_Finalize(CRYPT_HMAC_CTX* hmac, unsigned char* digest)
+{
+    HmacFinal((Hmac*)hmac, digest);
+
+    return 0;
+}
+
+

mcapi/crypto.h

@@ -101,6 +101,24 @@ enum {
 };
 
 
+/* HMAC */
+typedef struct CRYPT_HMAC_CTX {
+    long long holder[65];   /* big enough to hold internal, but check on init */
+} CRYPT_HMAC_CTX;
+
+int CRYPT_HMAC_SetKey(CRYPT_HMAC_CTX*, int, const unsigned char*, unsigned int);
+int CRYPT_HMAC_DataAdd(CRYPT_HMAC_CTX*, const unsigned char*, unsigned int);
+int CRYPT_HMAC_Finalize(CRYPT_HMAC_CTX*, unsigned char*);
+
+/* HMAC types */
+enum {
+    CRYPT_HMAC_SHA    = 1, 
+    CRYPT_HMAC_SHA256 = 2, 
+    CRYPT_HMAC_SHA384 = 5, 
+    CRYPT_HMAC_SHA512 = 4 
+};
+
+
 
 
 #ifdef __cplusplus

mcapi/test.c

@@ -32,6 +32,7 @@
 #include <cyassl/ctaocrypt/sha.h>
 #include <cyassl/ctaocrypt/sha256.h>
 #include <cyassl/ctaocrypt/sha512.h>
+#include <cyassl/ctaocrypt/hmac.h>
 
 /* c stdlib headers */
 #include <stdio.h>
@@ -39,12 +40,14 @@
 
 #define OUR_DATA_SIZE 1024
 static byte ourData[OUR_DATA_SIZE];
+static byte* key = NULL;
 
 static int check_md5(void);
 static int check_sha(void);
 static int check_sha256(void);
 static int check_sha384(void);
 static int check_sha512(void);
+static int check_hmac(void);
 
 
 int main(int argc, char** argv)
@@ -55,6 +58,13 @@ int main(int argc, char** argv)
     (void)argc;
     (void)argv;
 
+    /* align key pointer */
+    key = (byte*)malloc(128);
+    if (key == NULL) {
+        printf("mcapi key alloc failed\n");
+        return -1;
+    }
+
     for (i = 0; i < OUR_DATA_SIZE; i++)
         ourData[i] = (byte)i;
 
@@ -88,6 +98,12 @@ int main(int argc, char** argv)
         return -1;
     }
 
+    ret = check_hmac();
+    if (ret != 0) {
+        printf("mcapi check_hmac failed\n");
+        return -1;
+    }
+
 
 
     return 0;
@@ -229,3 +245,81 @@ static int check_sha512(void)
 }
 
 
+/* check mcapi hmac against internal */
+static int check_hmac(void)
+{
+    CRYPT_HMAC_CTX mcHmac;
+    Hmac           defHmac;
+    byte           mcDigest[CRYPT_SHA512_DIGEST_SIZE];
+    byte           defDigest[SHA512_DIGEST_SIZE];
+
+    strncpy((char*)key, "Jefe", 4);
+
+    /* SHA1 */
+    CRYPT_HMAC_SetKey(&mcHmac, CRYPT_HMAC_SHA, key, 4);
+    HmacSetKey(&defHmac, SHA, key, 4);
+
+    CRYPT_HMAC_DataAdd(&mcHmac, ourData, OUR_DATA_SIZE);
+    HmacUpdate(&defHmac, ourData, OUR_DATA_SIZE);
+
+    CRYPT_HMAC_Finalize(&mcHmac, mcDigest);
+    HmacFinal(&defHmac, defDigest);
+
+    if (memcmp(mcDigest, defDigest, CRYPT_SHA_DIGEST_SIZE) != 0) {
+        printf("hmac sha final memcmp fialed\n");
+        return -1;
+    } 
+    printf("hmac sha    mcapi test passed\n");
+
+    /* SHA-256 */
+    CRYPT_HMAC_SetKey(&mcHmac, CRYPT_HMAC_SHA256, key, 4);
+    HmacSetKey(&defHmac, SHA256, key, 4);
+
+    CRYPT_HMAC_DataAdd(&mcHmac, ourData, OUR_DATA_SIZE);
+    HmacUpdate(&defHmac, ourData, OUR_DATA_SIZE);
+
+    CRYPT_HMAC_Finalize(&mcHmac, mcDigest);
+    HmacFinal(&defHmac, defDigest);
+
+    if (memcmp(mcDigest, defDigest, CRYPT_SHA256_DIGEST_SIZE) != 0) {
+        printf("hmac sha256 final memcmp fialed\n");
+        return -1;
+    } 
+    printf("hmac sha256 mcapi test passed\n");
+
+    /* SHA-384 */
+    CRYPT_HMAC_SetKey(&mcHmac, CRYPT_HMAC_SHA384, key, 4);
+    HmacSetKey(&defHmac, SHA384, key, 4);
+
+    CRYPT_HMAC_DataAdd(&mcHmac, ourData, OUR_DATA_SIZE);
+    HmacUpdate(&defHmac, ourData, OUR_DATA_SIZE);
+
+    CRYPT_HMAC_Finalize(&mcHmac, mcDigest);
+    HmacFinal(&defHmac, defDigest);
+
+    if (memcmp(mcDigest, defDigest, CRYPT_SHA384_DIGEST_SIZE) != 0) {
+        printf("hmac sha384 final memcmp fialed\n");
+        return -1;
+    } 
+    printf("hmac sha384 mcapi test passed\n");
+
+    /* SHA-512 */
+    CRYPT_HMAC_SetKey(&mcHmac, CRYPT_HMAC_SHA512, key, 4);
+    HmacSetKey(&defHmac, SHA512, key, 4);
+
+    CRYPT_HMAC_DataAdd(&mcHmac, ourData, OUR_DATA_SIZE);
+    HmacUpdate(&defHmac, ourData, OUR_DATA_SIZE);
+
+    CRYPT_HMAC_Finalize(&mcHmac, mcDigest);
+    HmacFinal(&defHmac, defDigest);
+
+    if (memcmp(mcDigest, defDigest, CRYPT_SHA512_DIGEST_SIZE) != 0) {
+        printf("hmac sha512 final memcmp fialed\n");
+        return -1;
+    } 
+    printf("hmac sha512 mcapi test passed\n");
+
+    return 0;
+}
+
+