update signed ca

fix aes128-gcm crypt only usecase

IDE/Renesas/e2studio/RA6M4/common/wolfssl_demo.h

@@ -32,7 +32,8 @@
 #define FLASH_HP_DF_BLOCK_1   0x08000040U /*   64 B:  0x40100040 - 0x4010007F */
 #define FLASH_HP_DF_BLOCK_2   0x08000080U /*   64 B:  0x40100080 - 0x401000BF */
 #define FLASH_HP_DF_BLOCK_3   0x080000C0U /*   64 B:  0x401000C0 - 0x401000FF */
-#define DIRECT_KEY_ADDRESS      FLASH_HP_DF_BLOCK_1
+#define DIRECT_KEY_ADDRESS_256      FLASH_HP_DF_BLOCK_1
+#define DIRECT_KEY_ADDRESS_128      FLASH_HP_DF_BLOCK_2
 
 /* Enable wolfcrypt test */
 /* can be enabled with benchmark test */

IDE/Renesas/e2studio/RA6M4/test/key_data/key_data_sce.c

@@ -72,32 +72,32 @@ const st_user_key_block_data_t g_key_block_data =
  * This is used for Root Certificate verify by SCE */
 const unsigned char ca_cert_der_sign[] =
 {
-        0x07, 0x1A, 0x68, 0xF4, 0x53, 0x2A, 0x9B, 0x1F, 0xF7, 0x7B,
-        0x5C, 0x70, 0x88, 0x46, 0x03, 0x10, 0x35, 0x0C, 0x84, 0x4F,
-        0xDC, 0x09, 0x8D, 0xD8, 0x97, 0x10, 0xFA, 0xC7, 0x1D, 0x7F,
-        0xCC, 0xF2, 0xC9, 0x41, 0x27, 0xBA, 0x0C, 0x93, 0x77, 0x64,
-        0x46, 0x89, 0xC3, 0x36, 0x45, 0x5B, 0x2E, 0xC7, 0xCF, 0xE7,
-        0xDF, 0x61, 0x95, 0x12, 0x7B, 0x9B, 0x6B, 0x8B, 0xD8, 0xBD,
-        0xEA, 0x7B, 0xCD, 0xF9, 0x74, 0xA1, 0x1B, 0x41, 0x91, 0x9D,
-        0xC8, 0x08, 0xBA, 0xA4, 0x69, 0x19, 0xAD, 0xE0, 0x41, 0x54,
-        0xC6, 0x1A, 0x4A, 0x0E, 0xDB, 0x36, 0x23, 0xD9, 0xAC, 0xF6,
-        0x1B, 0x49, 0x6D, 0x74, 0x4D, 0x67, 0x5D, 0x36, 0xB9, 0xED,
-        0xC6, 0x09, 0x25, 0x13, 0x3A, 0x88, 0x3D, 0x83, 0x41, 0x16,
-        0x49, 0x94, 0xC5, 0x24, 0xFC, 0xD4, 0x81, 0xAE, 0x3F, 0x03,
-        0x1D, 0x9D, 0x76, 0x1F, 0x44, 0x1A, 0x91, 0xFB, 0xD7, 0x7E,
-        0xB7, 0x29, 0xA3, 0x73, 0x4D, 0x72, 0x21, 0xE4, 0x70, 0x02,
-        0x6F, 0xBE, 0xE0, 0x73, 0x5F, 0x44, 0x91, 0x34, 0xBC, 0x5B,
-        0x93, 0x27, 0x37, 0x05, 0x48, 0x19, 0x3B, 0x50, 0x19, 0x53,
-        0xC0, 0xE9, 0xA1, 0x1C, 0x26, 0xA5, 0x16, 0x80, 0xE8, 0x61,
-        0x39, 0xFF, 0x8B, 0x52, 0x10, 0xF7, 0x6B, 0x7A, 0x8F, 0xEC,
-        0x95, 0x1B, 0x30, 0xA4, 0xA0, 0xD7, 0xDB, 0x3F, 0xEB, 0xA5,
-        0x74, 0x48, 0xBA, 0x34, 0xB3, 0x34, 0xA5, 0xC1, 0x46, 0x65,
-        0x2E, 0xEA, 0xF1, 0xB9, 0x00, 0xF6, 0x13, 0xC9, 0x15, 0xC6,
-        0xB0, 0x4A, 0x18, 0xA8, 0x10, 0x57, 0xDF, 0x8E, 0x09, 0x67,
-        0xCC, 0xCA, 0x03, 0x15, 0x04, 0x17, 0x0A, 0xAC, 0x47, 0x8F,
-        0x1B, 0x0F, 0x0B, 0x6C, 0x91, 0x98, 0xFF, 0xFD, 0xC5, 0x10,
-        0x3F, 0x0A, 0xE7, 0x5D, 0x48, 0xE1, 0xD9, 0x79, 0xEB, 0xEA,
-        0x8D, 0x03, 0x96, 0x44, 0xB0, 0x0B
+        0x7C, 0xD5, 0x00, 0x40, 0x1A, 0x97, 0xAE, 0x31, 0xC0, 0x6B,
+        0x5E, 0x65, 0x9B, 0x95, 0xB8, 0xC0, 0xC9, 0xC9, 0xF7, 0xC9,
+        0xA2, 0x28, 0x39, 0xE7, 0x02, 0xF0, 0x4C, 0x3C, 0xE7, 0x8C,
+        0x8E, 0x9C, 0xFC, 0x96, 0x74, 0xCD, 0xDE, 0xE8, 0x08, 0x9A,
+        0x40, 0xD6, 0xE0, 0xC5, 0x20, 0x5B, 0xD8, 0xA6, 0x03, 0xA3,
+        0x60, 0x37, 0xD8, 0x8B, 0x17, 0x6D, 0x47, 0x7E, 0x5D, 0x1C,
+        0x75, 0x02, 0x08, 0x97, 0x14, 0x1E, 0x96, 0x3C, 0xEF, 0x76,
+        0x63, 0x40, 0x99, 0x47, 0xFD, 0xDC, 0xF4, 0xB2, 0xA2, 0xDA,
+        0x40, 0x75, 0x3C, 0x2C, 0x6A, 0xAC, 0x11, 0xE3, 0xE8, 0xDC,
+        0x8F, 0xCB, 0xD1, 0xC5, 0x35, 0x57, 0x8C, 0x4A, 0x4C, 0xFB,
+        0xAE, 0xF4, 0x5F, 0x32, 0xCE, 0xD2, 0x67, 0x69, 0x9D, 0x08,
+        0x0A, 0x1A, 0x34, 0xB7, 0x27, 0x7D, 0xFB, 0xED, 0xE4, 0x84,
+        0x18, 0xAD, 0xCA, 0xBA, 0xE1, 0x45, 0xAA, 0x15, 0xC8, 0x08,
+        0x2B, 0x2F, 0x64, 0x83, 0x3A, 0xC3, 0x5B, 0x6F, 0xA6, 0xEB,
+        0x07, 0x14, 0xCA, 0x0B, 0x5B, 0x64, 0x6F, 0x75, 0xE5, 0xDF,
+        0x53, 0x33, 0xFD, 0xC3, 0xC2, 0x75, 0xA9, 0xA4, 0x3B, 0x4E,
+        0x8E, 0xFC, 0x43, 0xB9, 0x03, 0x56, 0xBB, 0x12, 0xD3, 0x64,
+        0x65, 0x1E, 0x79, 0x18, 0xC8, 0x29, 0x3C, 0xB2, 0x9F, 0x5B,
+        0x3B, 0x0B, 0x7A, 0x59, 0x43, 0xBB, 0x2A, 0xEF, 0xF0, 0x2C,
+        0x50, 0xCD, 0x0C, 0xC5, 0x0E, 0x08, 0x5C, 0xB0, 0x31, 0xD4,
+        0x9C, 0xF4, 0xE2, 0x45, 0xC3, 0x4C, 0xBB, 0x29, 0x44, 0x13,
+        0x89, 0xE2, 0x7F, 0xD7, 0xE5, 0x7C, 0x2D, 0x89, 0xCA, 0xD4,
+        0xB0, 0x2E, 0xAF, 0x2C, 0x8D, 0x84, 0x87, 0x30, 0x40, 0x4D,
+        0xC5, 0x42, 0x6A, 0x1C, 0xF3, 0x6A, 0x24, 0xE5, 0x48, 0xA5,
+        0x53, 0x74, 0x87, 0xA0, 0xE5, 0x69, 0xF1, 0xD1, 0x7A, 0x85,
+        0x5E, 0x14, 0xD1, 0x00, 0x8A, 0xD2
 };
 
 const int sizeof_ca_cert_der_sign = sizeof(ca_cert_der_sign);
@@ -108,32 +108,32 @@ const int sizeof_ca_cert_der_sign = sizeof(ca_cert_der_sign);
  */
 const unsigned char ca_ecc_cert_der_sign[] =
 {
-        0x07, 0xCA, 0x3B, 0x8F, 0x49, 0x26, 0x33, 0x80, 0x46, 0xFE,
-        0x07, 0x91, 0x75, 0x5B, 0xC3, 0x98, 0x5F, 0x0E, 0x93, 0x0B,
-        0xDF, 0x1B, 0x1B, 0x01, 0x00, 0xD0, 0x5A, 0x48, 0x81, 0x05,
-        0xFC, 0x57, 0xB6, 0x0F, 0xF4, 0x6E, 0x4E, 0x7D, 0xB4, 0x14,
-        0x88, 0xFF, 0x8D, 0x75, 0x7A, 0xF5, 0xDE, 0x7B, 0x74, 0xF0,
-        0x98, 0x0B, 0xE2, 0x7A, 0xCB, 0xF3, 0x41, 0x70, 0xBC, 0xE2,
-        0x07, 0xF7, 0x3D, 0x69, 0xAF, 0xA8, 0xDA, 0xC5, 0x92, 0xAA,
-        0xE6, 0xA6, 0xF9, 0x1A, 0xED, 0x12, 0x76, 0x06, 0x1E, 0x4D,
-        0x43, 0xD9, 0x27, 0xEF, 0x30, 0x3D, 0x07, 0xAF, 0x63, 0x39,
-        0x3F, 0x95, 0x5F, 0xA5, 0x54, 0xFC, 0x26, 0x52, 0xFB, 0xDC,
-        0x8C, 0xA6, 0x64, 0x20, 0x39, 0x35, 0x6A, 0xB9, 0xFD, 0x52,
-        0x81, 0xAE, 0x56, 0x52, 0x61, 0xDD, 0xC0, 0xCE, 0x92, 0x4F,
-        0xEC, 0x0C, 0x72, 0x28, 0x2E, 0x3E, 0xB3, 0x29, 0xAA, 0x8B,
-        0xF1, 0xE9, 0xC7, 0x40, 0x57, 0x3C, 0xF1, 0x5D, 0xA8, 0x43,
-        0x17, 0xDB, 0x6A, 0x88, 0x36, 0x1E, 0x84, 0x88, 0xA4, 0x5D,
-        0x20, 0x64, 0xD5, 0x7D, 0x48, 0x72, 0xF5, 0x1E, 0x50, 0xF7,
-        0xB5, 0x49, 0x07, 0xD3, 0x9C, 0xB8, 0x2C, 0x0E, 0x9D, 0x0E,
-        0x4F, 0xFA, 0xB8, 0xCC, 0x4E, 0x14, 0xFD, 0xC1, 0xA4, 0x8E,
-        0x6F, 0x57, 0xA8, 0x75, 0x29, 0x25, 0xD3, 0x93, 0xD6, 0xF0,
-        0x22, 0xE6, 0x1A, 0x73, 0x51, 0xFA, 0x92, 0x3D, 0x0A, 0x04,
-        0xCB, 0x62, 0x8C, 0x9E, 0x50, 0x65, 0x11, 0x2A, 0xB9, 0xB8,
-        0x8B, 0x5C, 0x86, 0x6C, 0x37, 0x96, 0x5F, 0xEE, 0x50, 0xC0,
-        0x30, 0x9E, 0x54, 0x9E, 0xB5, 0xD8, 0xBB, 0xC5, 0x1B, 0x16,
-        0xB6, 0x54, 0x6B, 0x5E, 0xA4, 0x54, 0xA7, 0x04, 0xB3, 0x30,
-        0x7E, 0xE9, 0xB0, 0xAB, 0x10, 0x95, 0x6C, 0xE5, 0x76, 0x75,
-        0x5B, 0x52, 0xFB, 0x37, 0x4E, 0x23
+        0x6B, 0x56, 0xCA, 0x33, 0x2A, 0x87, 0xEC, 0x82, 0x64, 0x8A,
+        0xFF, 0x64, 0x5B, 0xAF, 0x10, 0xEB, 0x0A, 0xC1, 0x6F, 0xDF,
+        0x22, 0xC7, 0x90, 0xE5, 0xAB, 0x13, 0xB4, 0xC5, 0xA4, 0x95,
+        0x48, 0x52, 0x58, 0xE3, 0xF9, 0x00, 0xD6, 0x0E, 0xCC, 0xB2,
+        0xAB, 0xCC, 0x3A, 0x0D, 0x75, 0x27, 0x1F, 0xBB, 0x33, 0xC2,
+        0x04, 0xB3, 0x0D, 0x4D, 0xAF, 0x53, 0x2D, 0xF9, 0x1F, 0x3A,
+        0x4D, 0xBC, 0x68, 0x91, 0xF9, 0x50, 0x73, 0xE2, 0x67, 0x65,
+        0xF0, 0xB0, 0xCF, 0xF9, 0xDB, 0xA8, 0x6B, 0x97, 0x31, 0x86,
+        0x36, 0x67, 0x25, 0xF4, 0x59, 0xA2, 0x87, 0xF7, 0x86, 0x09,
+        0x13, 0x0C, 0x8B, 0x3F, 0x3C, 0x10, 0xCE, 0x37, 0x26, 0x6C,
+        0xED, 0x1F, 0x8B, 0x23, 0x9B, 0x07, 0x5A, 0x56, 0xA9, 0xDB,
+        0xB1, 0x81, 0xA2, 0xDC, 0x82, 0xE6, 0xC7, 0x8F, 0x97, 0xDF,
+        0x3E, 0x11, 0x4C, 0x74, 0x2C, 0xC3, 0xF9, 0x83, 0x58, 0x5C,
+        0x37, 0xCD, 0xEB, 0x63, 0xD6, 0x9A, 0xFD, 0x6D, 0x68, 0xC3,
+        0x73, 0x39, 0x08, 0x9C, 0x9A, 0x3C, 0x4E, 0x33, 0x88, 0xFF,
+        0x80, 0x00, 0xBA, 0xB2, 0x76, 0xE1, 0x55, 0x7A, 0xB1, 0x52,
+        0xF1, 0x6F, 0x33, 0x79, 0x5A, 0xBD, 0x33, 0x95, 0xA1, 0x02,
+        0x51, 0x1C, 0x48, 0x9D, 0x09, 0x96, 0x34, 0xF6, 0x4A, 0x10,
+        0x7F, 0xEF, 0x5C, 0xF0, 0x61, 0xFE, 0xA4, 0xE4, 0x39, 0xAA,
+        0xE8, 0x30, 0x11, 0x9E, 0x1D, 0x08, 0x5D, 0x05, 0x78, 0x27,
+        0x82, 0x5E, 0xAC, 0x73, 0x0F, 0xE9, 0xC3, 0xDA, 0x57, 0x41,
+        0x26, 0x02, 0x7B, 0xBA, 0x10, 0x97, 0x5D, 0x6F, 0x3E, 0xFA,
+        0xEE, 0x9C, 0x34, 0x7C, 0x09, 0x32, 0xB7, 0x49, 0xC9, 0x75,
+        0xA1, 0x2E, 0x94, 0x4A, 0x4F, 0xC4, 0xAF, 0xDE, 0x6C, 0x07,
+        0xFE, 0x2B, 0x1D, 0x59, 0xD1, 0x7E, 0x20, 0xDF, 0x4E, 0x6D,
+        0x3D, 0x2C, 0xDA, 0xFB, 0xF3, 0x88
 };
 static const int sizeof_ca_ecc_cert_der_sign = sizeof(ca_ecc_cert_der_sign);
 #endif /*  USE_CERT_BUFFERS_256 */

IDE/Renesas/e2studio/RA6M4/test/src/test_main.c

@@ -135,11 +135,14 @@ void sce_test(void)
 #if defined(WOLFSSL_RENESAS_SCEPROTECT) && defined(SCEKEY_INSTALLED)
     /* aes 256 */
     memcpy(guser_PKCbInfo.sce_wrapped_key_aes256.value,
-           (uint32_t *)DIRECT_KEY_ADDRESS, HW_SCE_AES256_KEY_INDEX_WORD_SIZE*4);
+           (uint32_t *)DIRECT_KEY_ADDRESS_256, HW_SCE_AES256_KEY_INDEX_WORD_SIZE*4);
     guser_PKCbInfo.sce_wrapped_key_aes256.type = SCE_KEY_INDEX_TYPE_AES256;
     guser_PKCbInfo.aes256_installedkey_set = 1;
     /* aes 128 */
-    guser_PKCbInfo.aes128_installedkey_set = 0;
+    memcpy(guser_PKCbInfo.sce_wrapped_key_aes128.value,
+               (uint32_t *)DIRECT_KEY_ADDRESS_128, HW_SCE_AES128_KEY_INDEX_WORD_SIZE*4);
+        guser_PKCbInfo.sce_wrapped_key_aes128.type = SCE_KEY_INDEX_TYPE_AES128;
+    guser_PKCbInfo.aes128_installedkey_set = 1;
 #endif
     printf("Start wolfCrypt Benchmark\n");
     benchmark_test(NULL);

wolfcrypt/src/port/Renesas/renesas_sce_aes.c

@@ -173,11 +173,19 @@ WOLFSSL_LOCAL int  wc_sce_AesGcmEncrypt(struct Aes* aes, byte* out,
             }
          
         }
-        else if (info->aes256_installedkey_set == 1) {
-          XMEMCPY(&key_client_aes, &info->sce_wrapped_key_aes256, 
+        else if (info->aes256_installedkey_set == 1 || info->aes128_installedkey_set == 1) {
+            if(aes->ctx.keySize == 32) {
+                XMEMCPY(&key_client_aes, &info->sce_wrapped_key_aes256,
                     sizeof(sce_aes_wrapped_key_t));
-          iv_l = iv;
-          ivSz_l = ivSz;
+            } else {
+                XMEMCPY(&key_client_aes, &info->sce_wrapped_key_aes128,
+                    sizeof(sce_aes_wrapped_key_t));
+            }
+            iv_l = iv;
+            ivSz_l = ivSz;
+        } else {
+            WOLFSSL_MSG("AES kes for SCE is not set.");
+            ret = -1;
         }
         
         if (ret == 0) {
@@ -346,11 +354,19 @@ WOLFSSL_LOCAL int  wc_sce_AesGcmDecrypt(struct Aes* aes, byte* out,
                 ret = -1;
             }
         }
-        else if (info->aes256_installedkey_set == 1) {
-            XMEMCPY(&key_server_aes, &info->sce_wrapped_key_aes256, 
-                      sizeof(sce_aes_wrapped_key_t));
+        else if (info->aes256_installedkey_set == 1 || info->aes128_installedkey_set == 1) {
+            if(aes->ctx.keySize == 32) {
+                XMEMCPY(&key_server_aes, &info->sce_wrapped_key_aes256,
+                    sizeof(sce_aes_wrapped_key_t));
+            } else {
+                XMEMCPY(&key_server_aes, &info->sce_wrapped_key_aes128,
+                    sizeof(sce_aes_wrapped_key_t));
+            }
             iv_l = iv;
             ivSz_l = ivSz;
+        } else {
+            WOLFSSL_MSG("AES kes for SCE is not set.");
+            ret = -1;
         }
 
         if (ret == 0) {