More peer review fixes. Fix the wolfCrypt test build.

Author: dgarske

test-app/Makefile

@@ -124,6 +124,7 @@ ifeq ($(WOLFCRYPT_SUPPORT),1)
   APP_OBJS+=$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/memory.o
   APP_OBJS+=$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/asn.o
   APP_OBJS+=$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/coding.o
+  APP_OBJS+=$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/wc_encrypt.o
 
   # Add SHA implementations (needed for test/benchmark)
   APP_OBJS+=$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/sha256.o

test-app/syscalls.c

@@ -93,9 +93,11 @@ int _write(int file, char *ptr, int len)
     /* Write to UART for stdout/stderr */
     if (file == 1 || file == 2) {
         uart_write(ptr, len);
+        return len;
     }
 
-    return len;
+    errno = EBADF;
+    return -1;
 }
 
 void _exit(int status)

tools/keytools/sign.c

@@ -1759,7 +1759,7 @@ static int make_header_ex(int is_diff, uint8_t *pubkey, uint32_t pubkey_sz,
             }
             partition_sz = (uint32_t)tmp;
 
-            if (env_ssize) {
+            if (env_ssize && *env_ssize) {
                 errno = 0;
                 tmp = strtoul(env_ssize, &endptr, 0);
                 if (endptr == env_ssize || *endptr != '\0' ||

tools/scripts/va416x0/build_test.sh

@@ -51,10 +51,10 @@ make clean && make wolfboot.bin && make test-app/image.bin
 
 # Function to sign image
 sign_image() {
-    IMAGE_HEADER_SIZE=${IMAGE_HEADER_SIZE} \
-    WOLFBOOT_PARTITION_SIZE=${PARTITION_SIZE} \
-    WOLFBOOT_SECTOR_SIZE=${SECTOR_SIZE} \
-    ./tools/keytools/sign ${SIGN_ARG} ${HASH_ARG} test-app/image.bin wolfboot_signing_private_key.der "$1"
+    IMAGE_HEADER_SIZE="${IMAGE_HEADER_SIZE}" \
+    WOLFBOOT_PARTITION_SIZE="${PARTITION_SIZE}" \
+    WOLFBOOT_SECTOR_SIZE="${SECTOR_SIZE}" \
+    ./tools/keytools/sign "${SIGN_ARG}" "${HASH_ARG}" test-app/image.bin wolfboot_signing_private_key.der "$1"
 }
 
 # Function to print summary
@@ -71,22 +71,22 @@ print_summary() {
 }
 
 if [ "$MODE" = "clean" ]; then
-    sign_image ${VERSION}
+    sign_image "${VERSION}"
     dd if=/dev/zero of=blank_update.bin bs=1K count=108
     ./tools/bin-assemble/bin-assemble factory.bin 0x0 wolfboot.bin \
-        ${BOOT_ADDRESS} test-app/image_v${VERSION}_signed.bin \
-        ${UPDATE_ADDRESS} blank_update.bin
-    ${JLINK} -CommanderScript tools/scripts/va416x0/flash_va416xx.jlink
+        "${BOOT_ADDRESS}" test-app/image_v${VERSION}_signed.bin \
+        "${UPDATE_ADDRESS}" blank_update.bin
+    "${JLINK}" -CommanderScript tools/scripts/va416x0/flash_va416xx.jlink
     print_summary
 else
-    TRIGGER_ADDRESS=$(printf "0x%X" $((${UPDATE_ADDRESS} + ${PARTITION_SIZE} - 5)))
-    PREV_VERSION=$((${VERSION} - 1))
-    sign_image ${PREV_VERSION} && sign_image ${VERSION}
+    TRIGGER_ADDRESS=$(printf "0x%X" $(("${UPDATE_ADDRESS}" + "${PARTITION_SIZE}" - 5)))
+    PREV_VERSION=$(("${VERSION}" - 1))
+    sign_image "${PREV_VERSION}" && sign_image "${VERSION}"
     echo -n "pBOOT" > trigger_magic.bin
     ./tools/bin-assemble/bin-assemble update.bin 0x0 wolfboot.bin \
-        ${BOOT_ADDRESS} test-app/image_v${PREV_VERSION}_signed.bin \
-        ${UPDATE_ADDRESS} test-app/image_v${VERSION}_signed.bin \
-        ${TRIGGER_ADDRESS} trigger_magic.bin
-    ${JLINK} -CommanderScript tools/scripts/va416x0/flash_va416xx_update.jlink
+        "${BOOT_ADDRESS}" test-app/image_v${PREV_VERSION}_signed.bin \
+        "${UPDATE_ADDRESS}" test-app/image_v${VERSION}_signed.bin \
+        "${TRIGGER_ADDRESS}" trigger_magic.bin
+    "${JLINK}" -CommanderScript tools/scripts/va416x0/flash_va416xx_update.jlink
     print_summary "${TRIGGER_ADDRESS}" "${PREV_VERSION}"
 fi