More peer review fixes

Author: dgarske

test-app/syscalls.c

@@ -90,8 +90,6 @@ extern void uart_write(const char *buf, unsigned int sz);
 
 int _write(int file, char *ptr, int len)
 {
-    int i;
-
     /* Write to UART for stdout/stderr */
     if (file == 1 || file == 2) {
         uart_write(ptr, len);

test-app/wolfcrypt_support.c

@@ -76,17 +76,19 @@ unsigned long my_time(unsigned long* timer)
  */
 double current_time(int reset)
 {
-    (void)reset;
-
 #if defined(WOLFCRYPT_SECURE_MODE)
     return wolfBoot_nsc_current_time(reset);
 #elif defined(TARGET_va416x0)
+    (void)reset;
     /* Use Vorago SDK SysTick-based millisecond counter */
     return (double)HAL_time_ms / 1000.0;
 #else
     /* Simple counter-based timing */
-    double timeNow = (double)tick_counter;
-    return timeNow;
+    if (reset)
+        tick_counter = 0;
+    else
+        tick_counter++;
+    return (double)tick_counter;
 #endif
 }
 #endif /* WOLFCRYPT_BENCHMARK */

tools/keytools/sign.c

@@ -1744,7 +1744,7 @@ static int make_header_ex(int is_diff, uint8_t *pubkey, uint32_t pubkey_sz,
     {
         const char *env_psize = getenv("WOLFBOOT_PARTITION_SIZE");
         const char *env_ssize = getenv("WOLFBOOT_SECTOR_SIZE");
-        if (env_psize) {
+        if (env_psize && *env_psize) {
             char *endptr;
             unsigned long tmp;
             uint32_t partition_sz, sector_sz = 0;
@@ -1779,10 +1779,17 @@ static int make_header_ex(int is_diff, uint8_t *pubkey, uint32_t pubkey_sz,
                 uint32_t max_img_sz = (sector_sz < partition_sz) ?
                     (partition_sz - sector_sz) : partition_sz;
                 if (total_img_sz > max_img_sz) {
-                    printf("Error: Image size %u (header %u + firmware %u) "
-                        "exceeds max %u (partition %u - sector %u)\n",
-                        total_img_sz, CMD.header_sz, image_sz,
-                        max_img_sz, partition_sz, sector_sz);
+                    if (sector_sz < partition_sz) {
+                        printf("Error: Image size %u (header %u + firmware %u) "
+                            "exceeds max %u (partition %u - sector %u)\n",
+                            total_img_sz, CMD.header_sz, image_sz,
+                            max_img_sz, partition_sz, sector_sz);
+                    } else {
+                        printf("Error: Image size %u (header %u + firmware %u) "
+                            "exceeds max %u (partition %u)\n",
+                            total_img_sz, CMD.header_sz, image_sz,
+                            max_img_sz, partition_sz);
+                    }
                     goto failure;
                 }
             }

tools/keytools/sign.py

@@ -724,10 +724,16 @@ def make_header(image_file, fw_version, extra_fields=[]):
     else:
         max_img_sz = WOLFBOOT_PARTITION_SIZE
     if total_img_sz > max_img_sz:
-        print("Error: Image size %d (header %d + firmware %d) "
-            "exceeds max %d (partition %d - sector %d)" %
-            (total_img_sz, WOLFBOOT_HEADER_SIZE, img_size,
-            max_img_sz, WOLFBOOT_PARTITION_SIZE, WOLFBOOT_SECTOR_SIZE))
+        if WOLFBOOT_SECTOR_SIZE < WOLFBOOT_PARTITION_SIZE:
+            print("Error: Image size %d (header %d + firmware %d) "
+                "exceeds max %d (partition %d - sector %d)" %
+                (total_img_sz, WOLFBOOT_HEADER_SIZE, img_size,
+                max_img_sz, WOLFBOOT_PARTITION_SIZE, WOLFBOOT_SECTOR_SIZE))
+        else:
+            print("Error: Image size %d (header %d + firmware %d) "
+                "exceeds max %d (partition %d)" %
+                (total_img_sz, WOLFBOOT_HEADER_SIZE, img_size,
+                max_img_sz, WOLFBOOT_PARTITION_SIZE))
         sys.exit(1)
 
 if (encrypt):

tools/test.mk

@@ -1110,7 +1110,7 @@ test-all: clean
 test-size-all:
 	make test-size SIGN=NONE LIMIT=5040 NO_ARM_ASM=1
 	make keysclean
-	make test-size SIGN=ED25519 LIMIT=11696 NO_ARM_ASM=1
+	make test-size SIGN=ED25519 LIMIT=11700 NO_ARM_ASM=1
 	make keysclean
 	make test-size SIGN=ECC256  LIMIT=18944 NO_ARM_ASM=1
 	make clean