Disable SHA-224 in FIPS

configure.ac

@@ -747,28 +747,6 @@ fi
 AM_CONDITIONAL([BUILD_SHA512], [test "x$ENABLED_SHA512" = "xyes"])
 
 
-# set sha224 default
-SHA224_DEFAULT=no
-if test "$host_cpu" = "x86_64"
-then
-SHA224_DEFAULT=yes
-fi
-
-# SHA224
-AC_ARG_ENABLE([sha224],
-    [AS_HELP_STRING([--enable-sha224],[Enable wolfSSL SHA-224 support (default: enabled on x86_64)])],
-    [ ENABLED_SHA224=$enableval ],
-    [ ENABLED_SHA224=$SHA224_DEFAULT ]
-    )
-
-if test "$ENABLED_SHA224" = "yes"
-then
-    AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_SHA224"
-fi
-
-AM_CONDITIONAL([BUILD_SHA224], [test "x$ENABLED_SHA224" = "xyes"])
-
-
 # SESSION CERTS
 AC_ARG_ENABLE([sessioncerts],
     [  --enable-sessioncerts   Enable session cert storing (default: disabled)],
@@ -1547,6 +1525,29 @@ fi
 AM_CONDITIONAL([BUILD_FIPS], [test "x$ENABLED_FIPS" = "xyes"])
 
 
+# set sha224 default
+SHA224_DEFAULT=no
+if test "$host_cpu" = "x86_64"
+then
+    SHA224_DEFAULT=yes
+fi
+SHA224_DEFAULT=$ENABLED_FIPS
+
+# SHA224
+AC_ARG_ENABLE([sha224],
+    [AS_HELP_STRING([--enable-sha224],[Enable wolfSSL SHA-224 support (default: enabled on x86_64)])],
+    [ ENABLED_SHA224=$enableval ],
+    [ ENABLED_SHA224=$SHA224_DEFAULT ]
+    )
+
+if test "$ENABLED_SHA224" = "yes"
+then
+    AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_SHA224"
+fi
+
+AM_CONDITIONAL([BUILD_SHA224], [test "x$ENABLED_SHA224" = "xyes"])
+
+
 # set POLY1305 default
 POLY1305_DEFAULT=yes
 

wolfcrypt/src/hash.c

@@ -186,7 +186,7 @@ int wc_Hash(enum wc_HashType hash_type, const byte* data,
 #endif
             break;
         case WC_HASH_TYPE_SHA224:
-#ifdef WOLFSSL_SHA512
+#ifdef WOLFSSL_SHA224
             ret = wc_Sha224Hash(data, data_len, hash);
 #endif
             break;

wolfcrypt/src/hmac.c

@@ -124,7 +124,7 @@ int wc_HmacSizeByType(int type)
             return SHA_DIGEST_SIZE;
     #endif
 
-    #ifndef WOLF_SHA224
+    #ifdef WOLF_SHA224
         case SHA224:
             return SHA224_DIGEST_SIZE;
     #endif