Merge pull request #261 from JacobBarthelmeh/macro

macro guards on SHA512 224/256 and include wolfssl/options.h

Author: bigbrett

src/wh_server_crypto.c

@@ -3473,12 +3473,16 @@ static int _HandleSha512(whServerContext* ctx, uint16_t magic,
     /* init sha2 struct with devid */
     hashType = req.resumeState.hashType;
     switch (hashType) {
+#ifndef WOLFSSL_NOSHA512_224
         case WC_HASH_TYPE_SHA512_224:
             ret = wc_InitSha512_224_ex(sha512, NULL, ctx->crypto->devId);
             break;
+#endif
+#ifndef WOLFSSL_NOSHA512_256
         case WC_HASH_TYPE_SHA512_256:
             ret = wc_InitSha512_256_ex(sha512, NULL, ctx->crypto->devId);
             break;
+#endif
         default:
             ret = wc_InitSha512_ex(sha512, NULL, ctx->crypto->devId);
             break;
@@ -3498,12 +3502,16 @@ static int _HandleSha512(whServerContext* ctx, uint16_t magic,
         }
         if (ret == 0) {
             switch (hashType) {
+#ifndef WOLFSSL_NOSHA512_224
                 case WC_HASH_TYPE_SHA512_224:
                     ret = wc_Sha512_224Final(sha512, res.hash);
                     break;
+#endif
+#ifndef WOLFSSL_NOSHA512_256
                 case WC_HASH_TYPE_SHA512_256:
                     ret = wc_Sha512_256Final(sha512, res.hash);
                     break;
+#endif
                 default:
                     ret = wc_Sha512Final(sha512, res.hash);
                     break;

wolfhsm/wh_settings.h

@@ -161,6 +161,8 @@
 #ifndef WOLFHSM_CFG_NO_CRYPTO
 #ifdef WOLFSSL_USER_SETTINGS
 #include "user_settings.h"
+#else
+#include <wolfssl/options.h>
 #endif /* WOLFSSL_USER_SETTINGS */
 
 #if defined(WOLFHSM_CFG_DEBUG) || defined(WOLFHSM_CFG_DEBUG_VERBOSE)