Merge pull request #64 from billphipps/unify_settings

Update to ensure wh_settings.h is being included in c files.

src/wh_client.c

@@ -21,6 +21,9 @@
  *
  */
 
+/* Pick up compile-time configuration */
+#include "wolfhsm/wh_settings.h"
+
 /* System libraries */
 #include <stdint.h>
 #include <stddef.h>  /* For NULL */
@@ -44,8 +47,7 @@
 #include "wolfssl/wolfcrypt/ecc.h"
 
 #include "wolfhsm/wh_client_cryptocb.h"
-
-#endif
+#endif /* WOLFHSM_CFG_NO_CRYPTO */
 
 /* Message definitions */
 #include "wolfhsm/wh_message.h"

src/wh_client_cryptocb.c

@@ -23,6 +23,9 @@
 
 #include <stdint.h>
 
+/* Pick up compile-time configuration */
+#include "wolfhsm/wh_settings.h"
+
 #include "wolfhsm/wh_client.h"
 #include "wolfhsm/wh_comm.h"
 #include "wolfhsm/wh_packet.h"

src/wh_client_nvm.c

@@ -25,6 +25,9 @@
 #include <stddef.h>  /* For NULL */
 #include <string.h>  /* For memset, memcpy */
 
+/* Pick up compile-time configuration */
+#include "wolfhsm/wh_settings.h"
+
 /* Common WolfHSM types and defines shared with the server */
 #include "wolfhsm/wh_common.h"
 #include "wolfhsm/wh_error.h"

src/wh_client_she.c

@@ -22,7 +22,8 @@
  */
 
 
-#include "wolfhsm/wh_client.h"
+/* Pick up compile-time configuration */
+#include "wolfhsm/wh_settings.h"
 
 #ifdef WOLFHSM_CFG_SHE_EXTENSION
 

src/wh_comm.c

@@ -21,6 +21,8 @@
  *
  */
 
+/* Pick up compile-time configuration */
+#include "wolfhsm/wh_settings.h"
 
 #include <stdint.h>  /* For sized ints */
 #include <stddef.h>

src/wh_flash_ramsim.c

@@ -21,6 +21,9 @@
  *
  */
 
+/* Pick up compile-time configuration */
+#include "wolfhsm/wh_settings.h"
+
 #include <stdint.h>
 #include <stddef.h>  /* For NULL */
 #include <stdlib.h>  /* For malloc/free */

src/wh_flash_unit.c

@@ -24,6 +24,9 @@
  *
  */
 
+/* Pick up compile-time configuration */
+#include "wolfhsm/wh_settings.h"
+
 #include <stdint.h>
 #include <stddef.h>     /* For NULL */
 #include <string.h>     /* For memset, memcpy */

src/wh_message_comm.c

@@ -20,6 +20,9 @@
  * src/wh_message_comm.c
  */
 
+/* Pick up compile-time configuration */
+#include "wolfhsm/wh_settings.h"
+
 #include <stdint.h>
 #include <stddef.h>
 #include <string.h>

src/wh_message_customcb.c

@@ -21,6 +21,9 @@
  *
  */
 
+/* Pick up compile-time configuration */
+#include "wolfhsm/wh_settings.h"
+
 #include <stddef.h>
 #include <stdint.h>
 #include <string.h>

src/wh_message_nvm.c

@@ -21,6 +21,9 @@
  *
  */
 
+/* Pick up compile-time configuration */
+#include "wolfhsm/wh_settings.h"
+
 #include <stdint.h>
 #include <stddef.h>
 #include <string.h>

src/wh_nvm.c

@@ -21,6 +21,9 @@
  *
  */
 
+/* Pick up compile-time configuration */
+#include "wolfhsm/wh_settings.h"
+
 #include <stdint.h>
 #include <stddef.h>     /* For NULL */
 #include <string.h>     /* For memset, memcpy */

src/wh_nvm_flash.c

@@ -23,6 +23,9 @@
  *
  */
 
+/* Pick up compile-time configuration */
+#include "wolfhsm/wh_settings.h"
+
 #include <stdint.h>
 #include <stddef.h>     /* For NULL */
 #include <string.h>     /* For memset, memcpy */

src/wh_server.c

@@ -21,6 +21,9 @@
  *
  */
 
+/* Pick up compile-time configuration */
+#include "wolfhsm/wh_settings.h"
+
 /* System libraries */
 #include <stdint.h>
 #include <stddef.h>  /* For NULL */

src/wh_server_counter.c

@@ -21,6 +21,9 @@
  *
  */
 
+/* Pick up compile-time configuration */
+#include "wolfhsm/wh_settings.h"
+
 #include <string.h>
 #include <stdint.h>
 

src/wh_server_crypto.c

@@ -21,8 +21,8 @@
  *
  */
 
-/* Pick up server config */
-#include "wolfhsm/wh_server.h"
+/* Pick up compile-time configuration */
+#include "wolfhsm/wh_settings.h"
 
 /* System libraries */
 #include <stdint.h>

src/wh_server_customcb.c

@@ -21,8 +21,8 @@
  *
  */
 
-/* Pick up server config */
-#include "wolfhsm/wh_server.h"
+/* Pick up compile-time configuration */
+#include "wolfhsm/wh_settings.h"
 
 #include <stdint.h>
 #include <stddef.h>

src/wh_server_dma.c

@@ -20,14 +20,15 @@
  * src/wh_server_dma.c
  */
 
-/* Pick up server config */
-#include "wolfhsm/wh_server.h"
+/* Pick up compile-time configuration */
+#include "wolfhsm/wh_settings.h"
 
 #include <stdint.h>
 #include <string.h>
 #include <stddef.h>
 
 #include "wolfhsm/wh_error.h"
+#include "wolfhsm/wh_server.h"
 
 
 /* TODO: if the Address allowlist ever gets large, we should consider a more

src/wh_server_keystore.c

@@ -21,8 +21,8 @@
  *
  */
 
-/* Pick up server config */
-#include "wolfhsm/wh_server.h"
+/* Pick up compile-time configuration */
+#include "wolfhsm/wh_settings.h"
 
 /* System libraries */
 #include <stdint.h>
@@ -39,10 +39,12 @@
 #include "wolfhsm/wh_error.h"
 #include "wolfhsm/wh_message.h"
 #include "wolfhsm/wh_packet.h"
+#include "wolfhsm/wh_server.h"
 
 #ifdef WOLFHSM_CFG_SHE_EXTENSION
 #include "wolfhsm/wh_server_she.h"
 #endif
+
 #include "wolfhsm/wh_server_keystore.h"
 
 int hsmGetUniqueId(whServerContext* server, whNvmId* outId)

src/wh_server_nvm.c

@@ -21,8 +21,8 @@
  *
  */
 
-/* Pick up server config */
-#include "wolfhsm/wh_server.h"
+/* Pick up compile-time configuration */
+#include "wolfhsm/wh_settings.h"
 
 /* System libraries */
 #include <stdint.h>
@@ -38,6 +38,7 @@
 #include "wolfhsm/wh_message.h"
 #include "wolfhsm/wh_message_nvm.h"
 
+#include "wolfhsm/wh_server.h"
 #include "wolfhsm/wh_server_nvm.h"
 
 int wh_Server_HandleNvmRequest(whServerContext* server,

src/wh_server_she.c

@@ -21,19 +21,19 @@
  *
  */
 
-
+/* Pick up compile-time configuration */
+#include "wolfhsm/wh_settings.h"
 
 /* System libraries */
 #include <stdint.h>
 #include <stddef.h>  /* For NULL */
 #include <string.h>  /* For memset, memcpy */
 
-
-#include "wolfhsm/wh_server.h"
 #include "wolfhsm/wh_message.h"
 #include "wolfhsm/wh_packet.h"
 #include "wolfhsm/wh_error.h"
 #include "wolfhsm/wh_utils.h"
+#include "wolfhsm/wh_server.h"
 
 #ifndef WOLFHSM_CFG_NO_CRYPTO
 #include "wolfssl/wolfcrypt/settings.h"

src/wh_she_common.c

@@ -35,6 +35,7 @@
 #include "wolfhsm/wh_error.h"
 #include "wolfhsm/wh_utils.h"
 
+#include "wolfhsm/wh_she_common.h"
 
 typedef struct {
     uint32_t count;

src/wh_transport_mem.c

@@ -22,6 +22,9 @@
  * Implementation of transport callbacks using 2 memory blocks
  */
 
+/* Pick up compile-time configuration */
+#include "wolfhsm/wh_settings.h"
+
 #include <stddef.h>
 #include <string.h>
 #include <stdint.h>

src/wh_utils.c

@@ -21,6 +21,9 @@
  *
  */
 
+/* Pick up compile-time configuration */
+#include "wolfhsm/wh_settings.h"
+
 #include <stdint.h>
 
 #include "wolfhsm/wh_utils.h"

test/wh_test_crypto.c

@@ -21,6 +21,8 @@
  *
  */
 
+#include "wolfhsm/wh_settings.h"
+
 #include <stdint.h>
 #include <stdio.h>  /* For printf */
 #include <string.h> /* For memset, memcpy */
@@ -36,8 +38,9 @@
 #include "wolfhsm/wh_flash_ramsim.h"
 #include "wolfhsm/wh_comm.h"
 #include "wolfhsm/wh_message.h"
-#include "wolfhsm/wh_server.h"
 #include "wolfhsm/wh_client.h"
+#include "wolfhsm/wh_server.h"
+
 #include "wolfhsm/wh_transport_mem.h"
 
 #include "wh_test_common.h"