rebase + fix merge conflicts

wolfSSL · Nov 1, 2024 · c28eb2f · c28eb2f
1 parent 1f8bce9
commit c28eb2f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/demo/client/wh_demo_client_keystore.c b/demo/client/wh_demo_client_keystore.c
@@ -57,7 +57,7 @@ int wh_DemoClient_KeystoreCommitKey(whClientContext* clientContext)
     uint8_t  label[]                    = "my secret key";
     uint8_t  exportKey[sizeof(key)]     = {0};
     uint8_t  exportLabel[sizeof(label)] = {0};
-    uint32_t exportKeySz                = 0;
+    uint16_t exportKeySz                = 0;
 
     /* Cache the key in the HSM */
     ret = wh_Client_KeyCache(clientContext, 0, label, sizeof(label), key,

diff --git a/posix/tcp/wh_client_tcp/wh_client_tcp.c b/posix/tcp/wh_client_tcp/wh_client_tcp.c
@@ -5,6 +5,7 @@
 #include <stdint.h>
 #include <stdio.h>  /* For printf */
 #include <string.h> /* For memset, memcpy */
+#include <unistd.h> /* for read */
 #include <time.h> /* For nanosleep */
 
 #include "wolfhsm/wh_error.h"

diff --git a/posix/tcp/wh_server_tcp/wh_server_tcp.c b/posix/tcp/wh_server_tcp/wh_server_tcp.c
@@ -9,6 +9,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#include <unistd.h> /* for read/close */
 #include <time.h> /* For nanosleep */
 
 #include "wolfhsm/wh_error.h"
@@ -140,7 +141,7 @@ static int wh_ServerTask(void* cf, const char* keyFilePath, int keyId,
         while (1) {
             ret = wh_Server_HandleRequestMessage(server);
             if (ret == WH_ERROR_NOTREADY) {
-                usleep(ONE_MS);
+                sleepMs(ONE_MS);
             }
             else if (ret != WH_ERROR_OK) {
                 printf("Failed to wh_Server_HandleRequestMessage: %d\n", ret);