From d3274e28e829cf65f75722ebd5e37be81efd145c Mon Sep 17 00:00:00 2001
From: Jacob Barthelmeh <jacob@wolfssl.com>
Date: Thu, 20 Dec 2018 14:22:35 -0700
Subject: [PATCH] fix for hash types with fips windows opensslextra build

---
 src/ssl.c                 | 12 ++++++------
 wolfssl/wolfcrypt/types.h |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/ssl.c b/src/ssl.c
index ffa3da6da..d2d7e34d3 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -13012,41 +13012,41 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
         else {
             switch (src->macType) {
             #ifndef NO_MD5
-                case WC_MD5:
+                case WC_HASH_TYPE_MD5:
                     wc_Md5Copy((wc_Md5*)&src->hash.digest,
                             (wc_Md5*)&des->hash.digest);
                     break;
             #endif /* !NO_MD5 */
 
             #ifndef NO_SHA
-                case WC_SHA:
+                case WC_HASH_TYPE_SHA:
                     wc_ShaCopy((wc_Sha*)&src->hash.digest,
                             (wc_Sha*)&des->hash.digest);
                     break;
             #endif /* !NO_SHA */
 
             #ifdef WOLFSSL_SHA224
-                case WC_SHA224:
+                case WC_HASH_TYPE_SHA224:
                     wc_Sha224Copy((wc_Sha224*)&src->hash.digest,
                             (wc_Sha224*)&des->hash.digest);
                     break;
             #endif /* WOLFSSL_SHA224 */
 
             #ifndef NO_SHA256
-                case WC_SHA256:
+                case WC_HASH_TYPE_SHA256:
                     wc_Sha256Copy((wc_Sha256*)&src->hash.digest,
                             (wc_Sha256*)&des->hash.digest);
                     break;
             #endif /* !NO_SHA256 */
 
             #ifdef WOLFSSL_SHA384
-                case WC_SHA384:
+                case WC_HASH_TYPE_SHA384:
                     wc_Sha384Copy((wc_Sha384*)&src->hash.digest,
                             (wc_Sha384*)&des->hash.digest);
                     break;
             #endif /* WOLFSSL_SHA384 */
             #ifdef WOLFSSL_SHA512
-                case WC_SHA512:
+                case WC_HASH_TYPE_SHA512:
                     wc_Sha512Copy((wc_Sha512*)&src->hash.digest,
                         (wc_Sha512*)&des->hash.digest);
                     break;
diff --git a/wolfssl/wolfcrypt/types.h b/wolfssl/wolfcrypt/types.h
index 58561f1aa..0d8a6a628 100644
--- a/wolfssl/wolfcrypt/types.h
+++ b/wolfssl/wolfcrypt/types.h
@@ -528,7 +528,7 @@
 
     /* hash types */
     enum wc_HashType {
-    #ifdef HAVE_SELFTEST
+    #if defined(HAVE_SELFTEST) || defined(HAVE_FIPS)
         /* In selftest build, WC_* types are not mapped to WC_HASH_TYPE types.
          * Values here are based on old selftest hmac.h enum, with additions */
         WC_HASH_TYPE_NONE = 15,