wolfssl/wolfcrypt/types.h: add missing values in FIPS <=v2 enum wc_HashType definition;

wolfcrypt/src/hash.c: in wc_OidGetHash(), fix misplaced gate re case SHA3_512h.

Author: douzzer

wolfcrypt/src/hash.c

@@ -337,8 +337,8 @@ enum wc_HashType wc_OidGetHash(int oid)
             hash_type = WC_ERR_TRACE(WC_HASH_TYPE_NONE);
         #endif
             break;
-        #ifdef WOLFSSL_SHA3
         case SHA3_512h:
+        #ifdef WOLFSSL_SHA3
             hash_type = WC_HASH_TYPE_SHA3_512;
         #else
             hash_type = WC_ERR_TRACE(WC_HASH_TYPE_NONE);

wolfssl/wolfcrypt/types.h

@@ -1442,9 +1442,13 @@ enum wc_HashType {
     WC_HASH_TYPE_SHA3_512 = 13,
     WC_HASH_TYPE_BLAKE2B = 14,
     WC_HASH_TYPE_BLAKE2S = 19,
+    WC_HASH_TYPE_SHA512_224 = 22,
+    WC_HASH_TYPE_SHA512_256 = 23,
     WC_HASH_TYPE_SHAKE128 = 20,
     WC_HASH_TYPE_SHAKE256 = 21,
-    WC_HASH_TYPE_MAX = WC_HASH_TYPE_SHAKE256
+    WC_HASH_TYPE_SM3     = 24,
+    WC_HASH_TYPE_MAX = WC_HASH_TYPE_SM3
+
     #ifndef WOLFSSL_NOSHA512_224
         #define WOLFSSL_NOSHA512_224
     #endif