fixes: wrong #endif placement in wh_client_crypto.c and #include order in nvm_flah_log.h (#243)

* nvm: flash_log: fix include order not picking up settings

* fix: wrong #endif placement

previous refactor leaves a spurious #endif that broke (at least) builds
without WOLFSSL_CMAC

Author: rizlik

src/wh_client_crypto.c

@@ -2823,6 +2823,7 @@ int wh_Client_AesGetKeyId(Aes* key, whNvmId* outId)
     *outId = WH_DEVCTX_TO_KEYID(key->devCtx);
     return WH_ERROR_OK;
 }
+#endif /* !NO_AES */
 
 #ifdef WOLFSSL_CMAC
 int wh_Client_CmacSetKeyId(Cmac* key, whNvmId keyId)
@@ -2868,7 +2869,6 @@ int wh_Client_Cmac(whClientContext* ctx, Cmac* cmac, CmacType type,
     WH_DEBUG_CLIENT_VERBOSE("cmac key:%p key_len:%d in:%p in_len:%d out:%p out_len:%d "
            "keyId:%x\n",
            key, (int)keyLen, in, (int)inLen, outMac, (int)mac_len, key_id);
-#endif
 
 
     /* Get data pointer */

wolfhsm/wh_nvm_flash_log.h

@@ -19,10 +19,10 @@
 #ifndef WOLFHSM_WH_NVM_FLASH_LOG_H_
 #define WOLFHSM_WH_NVM_FLASH_LOG_H_
 
-#if defined(WOLFHSM_CFG_SERVER_NVM_FLASH_LOG)
-
 #include "wolfhsm/wh_settings.h"
 
+#if defined(WOLFHSM_CFG_SERVER_NVM_FLASH_LOG)
+
 #include "wolfhsm/wh_common.h"
 #include "wolfhsm/wh_flash.h"