diff --git a/wolfcrypt/src/hash.c b/wolfcrypt/src/hash.c
index 62f9980e1..9c7682f2e 100644
--- a/wolfcrypt/src/hash.c
+++ b/wolfcrypt/src/hash.c
@@ -1302,13 +1302,6 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
             return MEMORY_E;
     #endif
 
-    #ifdef WOLF_CRYPTO_CB
-        /* find devId if its not an empty hash */
-        if (devId == INVALID_DEVID && data != NULL && len > 0) {
-            devId = wc_CryptoCb_DefaultDevID();
-        }
-    #endif
-
         if ((ret = wc_InitMd5_ex(md5, heap, devId)) != 0) {
             WOLFSSL_MSG("InitMd5 failed");
         }
@@ -1330,7 +1323,14 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
     }
     int wc_Md5Hash(const byte* data, word32 len, byte* hash)
     {
-        return wc_Md5Hash_ex(data, len, hash, NULL, INVALID_DEVID);
+        int devId = INVALID_DEVID;
+    #ifdef WOLF_CRYPTO_CB
+        /* find devId if its not an empty hash */
+        if (data != NULL && len > 0) {
+            devId = wc_CryptoCb_DefaultDevID();
+        }
+    #endif
+        return wc_Md5Hash_ex(data, len, hash, NULL, devId);
     }
 #endif /* !NO_MD5 */
 
@@ -1351,13 +1351,6 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
             return MEMORY_E;
     #endif
 
-    #ifdef WOLF_CRYPTO_CB
-        /* find devId if its not an empty hash */
-        if (devId == INVALID_DEVID && data != NULL && len > 0) {
-            devId = wc_CryptoCb_DefaultDevID();
-        }
-    #endif
-
         if ((ret = wc_InitSha_ex(sha, heap, devId)) != 0) {
             WOLFSSL_MSG("InitSha failed");
         }
@@ -1379,7 +1372,14 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
     }
     int wc_ShaHash(const byte* data, word32 len, byte* hash)
     {
-        return wc_ShaHash_ex(data, len, hash, NULL, INVALID_DEVID);
+        int devId = INVALID_DEVID;
+    #ifdef WOLF_CRYPTO_CB
+        /* find devId if its not an empty hash */
+        if (data != NULL && len > 0) {
+            devId = wc_CryptoCb_DefaultDevID();
+        }
+    #endif
+        return wc_ShaHash_ex(data, len, hash, NULL, devId);
     }
 #endif /* !NO_SHA */
 
@@ -1401,13 +1401,6 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
             return MEMORY_E;
     #endif
 
-    #ifdef WOLF_CRYPTO_CB
-        /* find devId if its not an empty hash */
-        if (devId == INVALID_DEVID && data != NULL && len > 0) {
-            devId = wc_CryptoCb_DefaultDevID();
-        }
-    #endif
-
         if ((ret = wc_InitSha224_ex(sha224, heap, devId)) != 0) {
             WOLFSSL_MSG("InitSha224 failed");
         }
@@ -1429,7 +1422,14 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
     }
     int wc_Sha224Hash(const byte* data, word32 len, byte* hash)
     {
-        return wc_Sha224Hash_ex(data, len, hash, NULL, INVALID_DEVID);
+        int devId = INVALID_DEVID;
+    #ifdef WOLF_CRYPTO_CB
+        /* find devId if its not an empty hash */
+        if (data != NULL && len > 0) {
+            devId = wc_CryptoCb_DefaultDevID();
+        }
+    #endif
+        return wc_Sha224Hash_ex(data, len, hash, NULL, devId);
     }
 #endif /* WOLFSSL_SHA224 */
 
@@ -1451,13 +1451,6 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
             return MEMORY_E;
     #endif
 
-    #ifdef WOLF_CRYPTO_CB
-        /* find devId if its not an empty hash */
-        if (devId == INVALID_DEVID && data != NULL && len > 0) {
-            devId = wc_CryptoCb_DefaultDevID();
-        }
-    #endif
-
         if ((ret = wc_InitSha256_ex(sha256, heap, devId)) != 0) {
             WOLFSSL_MSG("InitSha256 failed");
         }
@@ -1480,7 +1473,14 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
     }
     int wc_Sha256Hash(const byte* data, word32 len, byte* hash)
     {
-        return wc_Sha256Hash_ex(data, len, hash, NULL, INVALID_DEVID);
+        int devId = INVALID_DEVID;
+    #ifdef WOLF_CRYPTO_CB
+        /* find devId if its not an empty hash */
+        if (data != NULL && len > 0) {
+            devId = wc_CryptoCb_DefaultDevID();
+        }
+    #endif
+        return wc_Sha256Hash_ex(data, len, hash, NULL, devId);
     }
 #endif /* !NO_SHA256 */
 
@@ -1505,13 +1505,6 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
             return MEMORY_E;
     #endif
 
-    #ifdef WOLF_CRYPTO_CB
-        /* find devId if its not an empty hash */
-        if (devId == INVALID_DEVID && data != NULL && len > 0) {
-            devId = wc_CryptoCb_DefaultDevID();
-        }
-    #endif
-
         if ((ret = wc_InitSha512_ex(sha512, heap, devId)) != 0) {
             WOLFSSL_MSG("InitSha512 failed");
         }
@@ -1533,7 +1526,14 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
     }
     int wc_Sha512Hash(const byte* data, word32 len, byte* hash)
     {
-        return wc_Sha512Hash_ex(data, len, hash, NULL, INVALID_DEVID);
+        int devId = INVALID_DEVID;
+    #ifdef WOLF_CRYPTO_CB
+        /* find devId if its not an empty hash */
+        if (data != NULL && len > 0) {
+            devId = wc_CryptoCb_DefaultDevID();
+        }
+    #endif
+        return wc_Sha512Hash_ex(data, len, hash, NULL, devId);
     }
 #if !defined(HAVE_FIPS) && !defined(HAVE_SELFTEST)
 #ifndef WOLFSSL_NOSHA512_224
@@ -1554,13 +1554,6 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
             return MEMORY_E;
     #endif
 
-    #ifdef WOLF_CRYPTO_CB
-        /* find devId if its not an empty hash */
-        if (devId == INVALID_DEVID && data != NULL && len > 0) {
-            devId = wc_CryptoCb_DefaultDevID();
-        }
-    #endif
-
         if ((ret = wc_InitSha512_224_ex(sha512, heap, devId)) != 0) {
             WOLFSSL_MSG("wc_InitSha512_224 failed");
         }
@@ -1582,7 +1575,14 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
     }
     int wc_Sha512_224Hash(const byte* data, word32 len, byte* hash)
     {
-        return wc_Sha512_224Hash_ex(data, len, hash, NULL, INVALID_DEVID);
+        int devId = INVALID_DEVID;
+    #ifdef WOLF_CRYPTO_CB
+        /* find devId if its not an empty hash */
+        if (data != NULL && len > 0) {
+            devId = wc_CryptoCb_DefaultDevID();
+        }
+    #endif
+        return wc_Sha512_224Hash_ex(data, len, hash, NULL, devId);
     }
 #endif /* !WOLFSSL_NOSHA512_224 */
 #endif /* !HAVE_FIPS && !HAVE_SELFTEST */
@@ -1606,13 +1606,6 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
             return MEMORY_E;
     #endif
 
-    #ifdef WOLF_CRYPTO_CB
-        /* find devId if its not an empty hash */
-        if (devId == INVALID_DEVID && data != NULL && len > 0) {
-            devId = wc_CryptoCb_DefaultDevID();
-        }
-    #endif
-
         if ((ret = wc_InitSha512_256_ex(sha512, heap, devId)) != 0) {
             WOLFSSL_MSG("wc_InitSha512_256 failed");
         }
@@ -1634,7 +1627,14 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
     }
     int wc_Sha512_256Hash(const byte* data, word32 len, byte* hash)
     {
-        return wc_Sha512_256Hash_ex(data, len, hash, NULL, INVALID_DEVID);
+        int devId = INVALID_DEVID;
+    #ifdef WOLF_CRYPTO_CB
+        /* find devId if its not an empty hash */
+        if (data != NULL && len > 0) {
+            devId = wc_CryptoCb_DefaultDevID();
+        }
+    #endif
+        return wc_Sha512_256Hash_ex(data, len, hash, NULL, devId);
     }
 #endif /* !WOLFSSL_NOSHA512_256 */
 #endif /* !HAVE_FIPS && !HAVE_SELFTEST */
@@ -1659,13 +1659,6 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
             return MEMORY_E;
     #endif
 
-    #ifdef WOLF_CRYPTO_CB
-        /* find devId if its not an empty hash */
-        if (devId == INVALID_DEVID && data != NULL && len > 0) {
-            devId = wc_CryptoCb_DefaultDevID();
-        }
-    #endif
-
         if ((ret = wc_InitSha384_ex(sha384, heap, devId)) != 0) {
             WOLFSSL_MSG("InitSha384 failed");
         }
@@ -1687,7 +1680,14 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
     }
     int wc_Sha384Hash(const byte* data, word32 len, byte* hash)
     {
-        return wc_Sha384Hash_ex(data, len, hash, NULL, INVALID_DEVID);
+        int devId = INVALID_DEVID;
+    #ifdef WOLF_CRYPTO_CB
+        /* find devId if its not an empty hash */
+        if (data != NULL && len > 0) {
+            devId = wc_CryptoCb_DefaultDevID();
+        }
+    #endif
+        return wc_Sha384Hash_ex(data, len, hash, NULL, devId);
     }
 #endif /* WOLFSSL_SHA384 */
 
@@ -1710,13 +1710,6 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
             return MEMORY_E;
     #endif
 
-    #ifdef WOLF_CRYPTO_CB
-        /* find devId if its not an empty hash */
-        if (devId == INVALID_DEVID && data != NULL && len > 0) {
-            devId = wc_CryptoCb_DefaultDevID();
-        }
-    #endif
-
         if ((ret = wc_InitSha3_224(sha3, heap, devId)) != 0) {
             WOLFSSL_MSG("InitSha3_224 failed");
         }
@@ -1738,7 +1731,14 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
     }
     int wc_Sha3_224Hash(const byte* data, word32 len, byte* hash)
     {
-        return wc_Sha3_224Hash_ex(data, len, hash, NULL, INVALID_DEVID);
+        int devId = INVALID_DEVID;
+    #ifdef WOLF_CRYPTO_CB
+        /* find devId if its not an empty hash */
+        if (data != NULL && len > 0) {
+            devId = wc_CryptoCb_DefaultDevID();
+        }
+    #endif
+        return wc_Sha3_224Hash_ex(data, len, hash, NULL, devId);
     }
 #endif /* !WOLFSSL_NOSHA3_224 */
 
@@ -1760,13 +1760,6 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
             return MEMORY_E;
     #endif
 
-    #ifdef WOLF_CRYPTO_CB
-        /* find devId if its not an empty hash */
-        if (devId == INVALID_DEVID && data != NULL && len > 0) {
-            devId = wc_CryptoCb_DefaultDevID();
-        }
-    #endif
-
         if ((ret = wc_InitSha3_256(sha3, heap, devId)) != 0) {
             WOLFSSL_MSG("InitSha3_256 failed");
         }
@@ -1788,7 +1781,14 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
     }
     int wc_Sha3_256Hash(const byte* data, word32 len, byte* hash)
     {
-        return wc_Sha3_256Hash_ex(data, len, hash, NULL, INVALID_DEVID);
+        int devId = INVALID_DEVID;
+    #ifdef WOLF_CRYPTO_CB
+        /* find devId if its not an empty hash */
+        if (data != NULL && len > 0) {
+            devId = wc_CryptoCb_DefaultDevID();
+        }
+    #endif
+        return wc_Sha3_256Hash_ex(data, len, hash, NULL, devId);
     }
 #endif /* !WOLFSSL_NOSHA3_256 */
 
@@ -1810,13 +1810,6 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
             return MEMORY_E;
     #endif
 
-    #ifdef WOLF_CRYPTO_CB
-        /* find devId if its not an empty hash */
-        if (devId == INVALID_DEVID && data != NULL && len > 0) {
-            devId = wc_CryptoCb_DefaultDevID();
-        }
-    #endif
-
         if ((ret = wc_InitSha3_384(sha3, heap, devId)) != 0) {
             WOLFSSL_MSG("InitSha3_384 failed");
         }
@@ -1838,7 +1831,14 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
     }
     int wc_Sha3_384Hash(const byte* data, word32 len, byte* hash)
     {
-        return wc_Sha3_384Hash_ex(data, len, hash, NULL, INVALID_DEVID);
+        int devId = INVALID_DEVID;
+    #ifdef WOLF_CRYPTO_CB
+        /* find devId if its not an empty hash */
+        if (data != NULL && len > 0) {
+            devId = wc_CryptoCb_DefaultDevID();
+        }
+    #endif
+        return wc_Sha3_384Hash_ex(data, len, hash, NULL, devId);
     }
 #endif /* !WOLFSSL_NOSHA3_384 */
 
@@ -1860,13 +1860,6 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
             return MEMORY_E;
     #endif
 
-    #ifdef WOLF_CRYPTO_CB
-        /* find devId if its not an empty hash */
-        if (devId == INVALID_DEVID && data != NULL && len > 0) {
-            devId = wc_CryptoCb_DefaultDevID();
-        }
-    #endif
-
         if ((ret = wc_InitSha3_512(sha3, heap, devId)) != 0) {
             WOLFSSL_MSG("InitSha3_512 failed");
         }
@@ -1888,7 +1881,14 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
     }
     int wc_Sha3_512Hash(const byte* data, word32 len, byte* hash)
     {
-        return wc_Sha3_512Hash_ex(data, len, hash, NULL, INVALID_DEVID);
+        int devId = INVALID_DEVID;
+    #ifdef WOLF_CRYPTO_CB
+        /* find devId if its not an empty hash */
+        if (data != NULL && len > 0) {
+            devId = wc_CryptoCb_DefaultDevID();
+        }
+    #endif
+        return wc_Sha3_512Hash_ex(data, len, hash, NULL, devId);
     }
 #endif /* !WOLFSSL_NOSHA3_512 */
 
@@ -1910,13 +1910,6 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
             return MEMORY_E;
     #endif
 
-    #ifdef WOLF_CRYPTO_CB
-        /* find devId if its not an empty hash */
-        if (devId == INVALID_DEVID && data != NULL && len > 0) {
-            devId = wc_CryptoCb_DefaultDevID();
-        }
-    #endif
-
         if ((ret = wc_InitShake128(shake, heap, devId)) != 0) {
             WOLFSSL_MSG("InitShake128 failed");
         }
@@ -1939,8 +1932,15 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
     int wc_Shake128Hash(const byte* data, word32 len, byte* hash,
                         word32 hashLen)
     {
+        int devId = INVALID_DEVID;
+    #ifdef WOLF_CRYPTO_CB
+        /* find devId if its not an empty hash */
+        if (data != NULL && len > 0) {
+            devId = wc_CryptoCb_DefaultDevID();
+        }
+    #endif
         return wc_Shake128Hash_ex(data, len, hash, hashLen,
-            NULL, INVALID_DEVID);
+            NULL, devId);
     }
 #endif /* WOLFSSL_SHAKE_128 */
 
@@ -1962,13 +1962,6 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
             return MEMORY_E;
     #endif
 
-    #ifdef WOLF_CRYPTO_CB
-        /* find devId if its not an empty hash */
-        if (devId == INVALID_DEVID && data != NULL && len > 0) {
-            devId = wc_CryptoCb_DefaultDevID();
-        }
-    #endif
-
         if ((ret = wc_InitShake256(shake, heap, devId)) != 0) {
             WOLFSSL_MSG("InitShake256 failed");
         }
@@ -1991,8 +1984,15 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
     int wc_Shake256Hash(const byte* data, word32 len, byte* hash,
                         word32 hashLen)
     {
+        int devId = INVALID_DEVID;
+    #ifdef WOLF_CRYPTO_CB
+        /* find devId if its not an empty hash */
+        if (data != NULL && len > 0) {
+            devId = wc_CryptoCb_DefaultDevID();
+        }
+    #endif
         return wc_Shake256Hash_ex(data, len, hash, hashLen,
-            NULL, INVALID_DEVID);
+            NULL, devId);
     }
 #endif /* WOLFSSL_SHAKE_256 */
 #endif /* WOLFSSL_SHA3 */
@@ -2014,13 +2014,6 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
             return MEMORY_E;
     #endif
 
-    #ifdef WOLF_CRYPTO_CB
-        /* find devId if its not an empty hash */
-        if (devId == INVALID_DEVID && data != NULL && len > 0) {
-            devId = wc_CryptoCb_DefaultDevID();
-        }
-    #endif
-
         if ((ret = wc_InitSm3(sm3, heap, devId)) != 0) {
             WOLFSSL_MSG("InitSm3 failed");
         }
@@ -2042,7 +2035,14 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
     }
     int wc_Sm3Hash(const byte* data, word32 len, byte* hash)
     {
-        return wc_Sm3Hash_ex(data, len, hash, NULL, INVALID_DEVID);
+        int devId = INVALID_DEVID;
+    #ifdef WOLF_CRYPTO_CB
+        /* find devId if its not an empty hash */
+        if (data != NULL && len > 0) {
+            devId = wc_CryptoCb_DefaultDevID();
+        }
+    #endif
+        return wc_Sm3Hash_ex(data, len, hash, NULL, devId);
     }
 #endif /* !WOLFSSL_NOSHA3_224 */