From ca85bdc19822d53ab1db7d1fa897cc6cc4c3c25c Mon Sep 17 00:00:00 2001
From: Brett Nicholas <7547222+bigbrett@users.noreply.github.com>
Date: Wed, 30 Oct 2024 15:26:39 -0600
Subject: [PATCH] review feedback

---
 hal/aurix_tc3xx.c       |  5 +++--
 src/image.c             |  3 +++
 tools/keytools/keygen.c | 27 +++++++++++++++++----------
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/hal/aurix_tc3xx.c b/hal/aurix_tc3xx.c
index dabb4bd4b..4d77167dd 100644
--- a/hal/aurix_tc3xx.c
+++ b/hal/aurix_tc3xx.c
@@ -592,7 +592,8 @@ static int _connectCb(void* context, whCommConnected connect)
 
 int hal_hsm_init_connect(void)
 {
-    int rc = 0;
+    int    rc = 0;
+    size_t i;
 
     /* init shared memory buffers */
     uint32_t* req  = (uint32_t*)hsmShmCore0CommBuf;
@@ -625,7 +626,7 @@ int hal_hsm_init_connect(void)
     }
 
     /* init shared memory buffers */
-    for (size_t i=0; i<HSM_SHM_CORE0_COMM_BUF_WORDS; i++) {
+    for (i = 0; i < HSM_SHM_CORE0_COMM_BUF_WORDS; i++) {
         hsmShmCore0CommBuf[i] = 0;
     }
 
diff --git a/src/image.c b/src/image.c
index 6380a1c44..db385ab4c 100644
--- a/src/image.c
+++ b/src/image.c
@@ -235,6 +235,8 @@ static void wolfBoot_verify_signature_ecc(uint8_t key_slot,
         size_t  tmpSigSz                    = sizeof(tmpSigBuf);
 
     #if defined(WOLFBOOT_USE_WOLFHSM_PUBKEY_ID)
+        (void)key_slot;
+
         /* hardcoded, since not using keystore */
         const int point_sz = ECC_IMAGE_SIGNATURE_SIZE / 2;
 
@@ -396,6 +398,7 @@ static void wolfBoot_verify_signature_rsa(uint8_t key_slot,
         return;
     }
 #if defined(WOLFBOOT_USE_WOLFHSM_PUBKEY_ID)
+    (void)key_slot;
     /* public key is stored on server at hsmClientKeyIdPubKey*/
     ret = wh_Client_RsaSetKeyId(&rsa, hsmClientKeyIdPubKey);
     if (ret != 0) {
diff --git a/tools/keytools/keygen.c b/tools/keytools/keygen.c
index 9ab5d625a..02564b1fc 100644
--- a/tools/keytools/keygen.c
+++ b/tools/keytools/keygen.c
@@ -358,22 +358,27 @@ static int generated_keypairs_type[MAX_KEYPAIRS];
 static uint32_t generated_keypairs_id_mask[MAX_KEYPAIRS];
 static int n_generated = 0;
 
-static char *append_pub_to_fname(const char *filename) {
-    const char pubSuffix[] = "_pub";
+static char* append_pub_to_fname(const char* filename)
+{
+    const char   pubSuffix[]     = "_pub";
     const size_t pubSuffixLength = strlen(pubSuffix);
+    const char*  dotPosition;
+    size_t       prefixLength;
+    char*        newFilename;
+    size_t       newFilenameLength;
 
-    const char *dotPosition = strchr(filename, '.');
-
-    size_t prefixLength;
+    dotPosition = strchr(filename, '.');
     if (dotPosition != NULL) {
         prefixLength = dotPosition - filename;
-    } else {
+    }
+    else {
         prefixLength = strlen(filename);
     }
 
-    size_t newFilenameLength = prefixLength + pubSuffixLength + (dotPosition ? strlen(dotPosition) : 0) + 1;
+    newFilenameLength = prefixLength + pubSuffixLength +
+                        (dotPosition ? strlen(dotPosition) : 0) + 1;
 
-    char *newFilename = (char *)malloc(newFilenameLength);
+    newFilename = (char*)malloc(newFilenameLength);
     if (newFilename == NULL) {
         return NULL;
     }
@@ -387,8 +392,10 @@ static char *append_pub_to_fname(const char *filename) {
     /* Append the rest of the original filename if a period was found */
     if (dotPosition != NULL) {
         strcpy(newFilename + prefixLength + pubSuffixLength, dotPosition);
-    } else {
-        newFilename[prefixLength + pubSuffixLength] = '\0'; /* Null-terminate the string if no period */
+    }
+    else {
+        /* Null-terminate the string if no period */
+        newFilename[prefixLength + pubSuffixLength] = '\0';
     }
 
     return newFilename;