More fixes for compilier quieting. 5

wolfSSL · Apr 4, 2024 · 13624c9 · 13624c9
1 parent 5e46371
commit 13624c9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/src/wh_server.c b/src/wh_server.c
@@ -18,7 +18,7 @@
 
 /* Server API's */
 #include "wolfhsm/wh_server.h"
-#include "wolfhsm/wh_server_internal.h"
+#include "wolfhsm/wh_server_nvm.h"
 #include "wolfhsm/wh_server_crypto.h"
 #if defined(WOLFHSM_SHE_EXTENSION)
 #include "wolfhsm/wh_server_she.h"

diff --git a/src/wh_server_crypto.c b/src/wh_server_crypto.c
@@ -17,6 +17,8 @@
 #include "wolfhsm/wh_server.h"
 #include "wolfhsm/wh_packet.h"
 
+#include "wolfhsm/wh_server_crypto.h"
+
 static int hsmGetUniqueId(whServerContext* server)
 {
     int i;
@@ -232,7 +234,7 @@ int wh_Server_HandleCryptoRequest(whServerContext* server,
     uint16_t action, uint8_t* data, uint16_t* size)
 {
     int ret = 0;
-    uint32_t field;
+    word32 field;
     uint8_t* out;
     whPacket* packet = (whPacket*)data;
 #ifdef WOLFHSM_SYMMETRIC_INTERNAL

diff --git a/src/wh_server_nvm.c b/src/wh_server_nvm.c
@@ -14,6 +14,8 @@
 #include "wolfhsm/wh_message_nvm.h"
 #include "wolfhsm/wh_server.h"
 
+#include "wolfhsm/wh_server_nvm.h"
+
 int wh_Server_HandleNvmRequest(whServerContext* server,
         uint16_t magic, uint16_t action, uint16_t seq,
         uint16_t req_size, const void* req_packet,

diff --git a/wolfhsm/wh_server_nvm.h b/wolfhsm/wh_server_nvm.h
@@ -1,5 +1,5 @@
-#ifndef WOLFHSM_WH_SERVER_INTERNAL_H_
-#define WOLFHSM_WH_SERVER_INTERNAL_H_
+#ifndef WOLFHSM_WH_SERVER_NVM_H_
+#define WOLFHSM_WH_SERVER_NVM_H_
 
 /*
  * WolfHSM Internal Server API
@@ -17,4 +17,4 @@ int wh_Server_HandleNvmRequest(whServerContext* server,
         uint16_t req_size, const void* req_packet,
         uint16_t *out_resp_size, void* resp_packet);
 
-#endif /* WOLFHSM_WH_SERVER_INTERNAL_H_ */
+#endif /* WOLFHSM_WH_SERVER_NVM_H_ */