add blake to evp

Author: julek-wolfssl

wolfcrypt/src/evp.c

@@ -10867,6 +10867,22 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD* type)
                 ret = WOLFSSL_FAILURE;
              }
         } else
+    #endif
+    #ifdef HAVE_BLAKE2
+        if (XSTRCMP(md, WC_SN_blake2b512) == 0) {
+            if (wc_InitBlake2b(&ctx->hash.digest.blake2b,
+                    WC_BLAKE2B_DIGEST_SIZE) != 0) {
+                ret = WOLFSSL_FAILURE;
+            }
+        } else
+    #endif
+    #ifdef HAVE_BLAKE2S
+        if (XSTRCMP(md, WC_SN_blake2s256) == 0) {
+            if (wc_InitBlake2s(&ctx->hash.digest.blake2s,
+                    WC_BLAKE2S_DIGEST_SIZE) != 0) {
+                ret = WOLFSSL_FAILURE;
+            }
+        } else
     #endif
         {
              ctx->macType = WC_HASH_TYPE_NONE;
@@ -11002,12 +11018,32 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD* type)
                     ret = WOLFSSL_SUCCESS;
                 }
                 break;
+        #endif
+        #ifdef HAVE_BLAKE2
+            case WC_HASH_TYPE_BLAKE2B:
+                if (wc_Blake2bUpdate(&ctx->hash.digest.blake2b,
+                        (const byte*)data, (word32)sz) == 0) {
+                    ret = WOLFSSL_SUCCESS;
+                }
+                break;
+        #endif
+        #ifdef HAVE_BLAKE2S
+            case WC_HASH_TYPE_BLAKE2S:
+                if (wc_Blake2sUpdate(&ctx->hash.digest.blake2s,
+                        (const byte*)data, (word32)sz) == 0) {
+                    ret = WOLFSSL_SUCCESS;
+                }
+                break;
         #endif
             case WC_HASH_TYPE_NONE:
             case WC_HASH_TYPE_MD2:
             case WC_HASH_TYPE_MD5_SHA:
+        #ifndef HAVE_BLAKE2
             case WC_HASH_TYPE_BLAKE2B:
+        #endif
+        #ifndef HAVE_BLAKE2S
             case WC_HASH_TYPE_BLAKE2S:
+        #endif
             default:
                 return WOLFSSL_FAILURE;
         }
@@ -11132,12 +11168,34 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD* type)
                     ret = WOLFSSL_SUCCESS;
                 }
                 break;
+        #endif
+        #ifdef HAVE_BLAKE2
+            case WC_HASH_TYPE_BLAKE2B:
+                if (wc_Blake2bFinal(&ctx->hash.digest.blake2b, md,
+                        WC_BLAKE2B_DIGEST_SIZE) == 0) {
+                    if (s) *s = WC_BLAKE2B_DIGEST_SIZE;
+                    ret = WOLFSSL_SUCCESS;
+                }
+                break;
+        #endif
+        #ifdef HAVE_BLAKE2S
+            case WC_HASH_TYPE_BLAKE2S:
+                if (wc_Blake2sFinal(&ctx->hash.digest.blake2s, md,
+                        WC_BLAKE2S_DIGEST_SIZE) == 0) {
+                    if (s) *s = WC_BLAKE2S_DIGEST_SIZE;
+                    ret = WOLFSSL_SUCCESS;
+                }
+                break;
         #endif
             case WC_HASH_TYPE_NONE:
             case WC_HASH_TYPE_MD2:
             case WC_HASH_TYPE_MD5_SHA:
+        #ifndef HAVE_BLAKE2
             case WC_HASH_TYPE_BLAKE2B:
+        #endif
+        #ifndef HAVE_BLAKE2S
             case WC_HASH_TYPE_BLAKE2S:
+        #endif
             default:
                 return WOLFSSL_FAILURE;
         }
@@ -11172,12 +11230,22 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD* type)
             case WC_HASH_TYPE_SHA3_512:
         #ifdef WOLFSSL_SM3
             case WC_HASH_TYPE_SM3:
+        #endif
+        #ifdef HAVE_BLAKE2
+            case WC_HASH_TYPE_BLAKE2B:
+        #endif
+        #ifdef HAVE_BLAKE2S
+            case WC_HASH_TYPE_BLAKE2S:
         #endif
             case WC_HASH_TYPE_NONE:
             case WC_HASH_TYPE_MD2:
             case WC_HASH_TYPE_MD5_SHA:
+        #ifndef HAVE_BLAKE2
             case WC_HASH_TYPE_BLAKE2B:
+        #endif
+        #ifndef HAVE_BLAKE2S
             case WC_HASH_TYPE_BLAKE2S:
+        #endif
                 break;
 
         #if defined(WOLFSSL_SHA3) && defined(WOLFSSL_SHAKE128)

wolfssl/openssl/evp.h

@@ -61,6 +61,12 @@
 #ifdef WOLFSSL_SM3
     #include <wolfssl/wolfcrypt/sm3.h>
 #endif
+#ifdef HAVE_BLAKE2
+    #include <wolfssl/wolfcrypt/blake2.h>
+#endif
+#ifdef HAVE_BLAKE2S
+    #include <wolfssl/wolfcrypt/blake2.h>
+#endif
 #ifdef WOLFSSL_SM4
     #include <wolfssl/wolfcrypt/sm4.h>
 #endif
@@ -224,6 +230,12 @@ typedef union {
     #if defined(WOLFSSL_SHAKE128) || defined(WOLFSSL_SHAKE256)
         wc_Shake            shake;
     #endif
+    #ifdef HAVE_BLAKE2
+        Blake2b             blake2b;
+    #endif
+    #ifdef HAVE_BLAKE2S
+        Blake2s             blake2s;
+    #endif
 } WOLFSSL_Hasher;