address review comments

Author: miyazakh

.gitignore

@@ -158,6 +158,8 @@ IDE/Renesas/e2studio/RZN2L/app_RZ/.api_xml
 IDE/Renesas/e2studio/RZN2L/app_RZ/.secure_azone
 IDE/Renesas/e2studio/RZN2L/app_RZ/.secure_xml
 IDE/Renesas/e2studio/RZN2L/app_RZ/configuration.xml
+IDE/Renesas/e2studio/RZN2L/app_RZ/rzn_cfg.txt
+IDE/Release/e2Studio/RZN2L/app_RZ/JLinkLog.log
 IDE/Renesas/e2studio/RZN2L/flash_app/Debug
 IDE/Renesas/e2studio/RZN2L/flash_app/rzn
 IDE/Renesas/e2studio/RZN2L/flash_app/rzn_gen
@@ -167,6 +169,10 @@ IDE/Renesas/e2studio/RZN2L/flash_app/.api_xml
 IDE/Renesas/e2studio/RZN2L/flash_app/.secure_azone
 IDE/Renesas/e2studio/RZN2L/flash_app/.secure_xml
 IDE/Renesas/e2studio/RZN2L/flash_app/configuration.xml
+IDE/Renesas/e2studio/RZN2L/flash_app/rzn_cfg.txt
+IDE/Release/e2Studio/RZN2L/flash_app/JLinkLog.log
+IDE/Renesas/e2studio/RZN2L/flash_app/flash_simple_loader.elf.jlink
+IDE/Renesas/e2studio/RZN2L/flash_app/flash_simple_loader.elf.launch
 IDE/Renesas/e2studio/RZN2L/wolfboot/Debug
 IDE/Renesas/e2studio/RZN2L/wolfboot/rzn
 IDE/Renesas/e2studio/RZN2L/wolfboot/rzn_gen
@@ -176,4 +182,11 @@ IDE/Renesas/e2studio/RZN2L/wolfboot/.api_xml
 IDE/Renesas/e2studio/RZN2L/wolfboot/.secure_azone
 IDE/Renesas/e2studio/RZN2L/wolfboot/.secure_xml
 IDE/Renesas/e2studio/RZN2L/wolfboot/configuration.xml
+IDE/Renesas/e2studio/RZN2L/wolfboot/rzn_cfg.txt
+IDE/Release/e2Studio/RZN2L/wolfboot/JLinkLog.log
+IDE/Renesas/e2studio/RZN2L/wolfboot/wolfBoot_RZ.elf.jlink
+IDE/Renesas/e2studio/RZN2L/wolfboot/wolfBoot_RZ.elf.launch
+IDE/Renesas/e2studio/RZN2L/wolfboot/.cache/*
+IDE/Renesas/e2studio/RZN2L/flash_app/.cache/*
+IDE/Release/e2studio/RZN2L/app_RZ/.cache/*
 

IDE/Renesas/e2studio/RZN2L/flash_app/src/Flash_update.s

@@ -26,5 +26,5 @@
 the loader project. */
 
 .section .IMAGE_APP_FLASH_update, "ax", %progbits
-/* To download the app v2, please remove comment out.  */
+/* To download the app v2, please enable the line below.  */
 /* .incbin "../../app_RZ/Debug/app_RZ_v2.0_signed.bin" */

IDE/Renesas/e2studio/RZN2L/flash_app/src/Flash_wrappedkey_public.s

@@ -1,8 +1,4 @@
-/* Flash_sections.s
- *
- * Custom configuration for wolfCrypt/wolfSSL.
- * Enabled via WOLFSSL_USER_SETTINGS.
- *
+/* Flash_wrappedkey_public.s
  *
  * Copyright (C) 2024 wolfSSL Inc.
  *
@@ -26,5 +22,5 @@
 the loader project. */
 
 .section .WRAPPED_KEY_FLASH_PUB, "ax", %progbits
-/* To download the encrypted rsip key, please remove comment out.  */
+/* To download the encrypted rsip key, please enable the line below.  */
 /* .incbin "../rsa_pub2048.bin" */

hal/renesas-rz.c

@@ -127,47 +127,49 @@ void ext_flash_unlock(void)
 
 void hal_init(void)
 {
+    
 #if defined(WOLFBOOT_RENESAS_RSIP) && !defined(WOLFBOOT_RENESAS_APP)
-	fsp_err_t err;
-	int ret;
-	rsa_public_t rsip_pub_key;
-	const size_t key_size = sizeof(rsip_pub_key);
-	
+
+    fsp_err_t err;
+    int ret;
+    rsa_public_t rsip_pub_key;
+    const size_t key_size = sizeof(rsip_pub_key);
+
     err = wolfCrypt_Init();
     if (err != 0) {
-          printf("ERROR: wolfCrypt_Init %d\n", err);
-          hal_panic();
+        printf("ERROR: wolfCrypt_Init %d\n", err);
+        hal_panic();
     }
 
     /* copy the key from ext flash to RAM */
     ret = ext_flash_read(RENESAS_RSIP_INSTALLEDKEY_FLASH_ADDR,
-    		(uint8_t*)RENESAS_RSIP_INSTALLEDKEY_RAM_ADDR, key_size);
+            (uint8_t*)RENESAS_RSIP_INSTALLEDKEY_RAM_ADDR, key_size);
     if (ret != key_size){
         wolfBoot_printf("Error reading public key at %lx\n",
         RENESAS_RSIP_INSTALLEDKEY_FLASH_ADDR);
          hal_panic();
     }
     /* import enrypted key */
     XMEMCPY(&rsip_pub_key, (const void*)RENESAS_RSIP_INSTALLEDKEY_RAM_ADDR, key_size);
-    err = R_RSIP_KeyImportWithUFPK(&rsip_ctrl,
-    		rsip_pub_key.wufpk,
-			rsip_pub_key.initial_vector,
-            RSIP_KEY_TYPE_RSA_2048_PUBLIC_ENHANCED,
-			rsip_pub_key.encrypted_user_key,
-            p_wrapped_public_key);
-    
+
+    err = R_RSIP_KeyImportWithUFPK(&rsip_ctrl, rsip_pub_key.wufpk,
+                                    rsip_pub_key.initial_vector,
+                                    RSIP_KEY_TYPE_RSA_2048_PUBLIC_ENHANCED,
+                                    rsip_pub_key.encrypted_user_key,
+                                    p_wrapped_public_key);
+
     XMEMSET(&pkInfo, 0, sizeof(pkInfo));
-    pkInfo.wrapped_key_rsapub2048 = 
-              (rsip_wrapped_key_t*)p_wrapped_public_key;
 
+    pkInfo.wrapped_key_rsapub2048 =
+              (rsip_wrapped_key_t*)p_wrapped_public_key;
     pkInfo.keyflgs_crypt.bits.rsapub2048_installedkey_set = 1;
     pkInfo.keyflgs_crypt.bits.message_type = 1;
     pkInfo.hash_type = RSIP_HASH_TYPE_SHA256;
     err = wc_CryptoCb_CryptInitRenesasCmn(NULL, &pkInfo);
 
     if (err < 0) {
-         wolfBoot_printf("ERROR: wc_CryptoCb_CryptInitRenesasCmn %d\n", err);
-         hal_panic();
+        wolfBoot_printf("ERROR: wc_CryptoCb_CryptInitRenesasCmn %d\n", err);
+        hal_panic();
     }
 
 #endif
@@ -203,7 +205,6 @@ void hal_flash_lock(void)
     return;
 }
 
-
 void* hal_get_primary_address(void)
 {
     return (void*)WOLFBOOT_PARTITION_BOOT_ADDRESS;