Skip to content

Commit a474179

Browse files
cconloncconlon
authored
Merge pull request #6301 from miyazakh/ra_cryptonly
Add Renesas SCE RSA Crypt Only support
2 parents 1b6ab01 + a2776ad commit a474179

20 files changed

Lines changed: 1146 additions & 193 deletions

File tree

‎IDE/Renesas/e2studio/RA6M4/README.md‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,21 @@ The wolfssl Project Summary is listed below and is relevant for every project.
3030

3131
|Components|Version|
3232
|:--|:--|
33-
|Board Support Package Common Files|v3.5.0|
34-
|Secure Cryptography Engine on RA6 Protected Mode|v3.5.0|
35-
|I/O Port|v3.5.0|
36-
|Arm CMSIS Version 5 - Core (M)|v5.8.0+fsp.3.5.0|
33+
|Board Support Package Common Files|v3.6.0|
34+
|Secure Cryptography Engine on RA6 Protected Mode|v3.6.0|
35+
|I/O Port|v3.6.0|
36+
|Arm CMSIS Version 5 - Core (M)|v5.8.0+fsp.3.6.0|
3737
|RA6M4-EK Board Support Files|v3.5.0|
38-
|Board support package for R7FA6M4AF3CFB|v3.5.0|
39-
|Board support package for RA6M4|v3.5.0|
40-
|Board support package for RA6M4 - FSP Data|v3.5.0|
41-
|FreeRTOS|v10.4.3-LTS.Patch.2+fsp.3.5.0|
42-
|FreeRTOS - Memory Management - Heap 4|v10.4.3-LTS.Patch.2+fsp.3.5.0|
43-
|r_ether to FreeRTOS+TCP Wrapper|v3.5.0|
44-
|Ethernet|v3.5.0|
45-
|Ethernet PHY|v3.5.0|
46-
|FreeRTOS+TCP|v2.3.2-LTS.Patch.1+fsp.3.5.0|
47-
|FreeRTOS - Buffer Allocation 2|v2.3.2-LTS.Patch.1+fsp.3.5.0|
38+
|Board support package for R7FA6M4AF3CFB|v3.6.0|
39+
|Board support package for RA6M4|v3.6.0|
40+
|Board support package for RA6M4 - FSP Data|v3.6.0|
41+
|FreeRTOS|v10.4.3-LTS.Patch.2+fsp.3.6.0|
42+
|FreeRTOS - Memory Management - Heap 4|v10.4.3-LTS.Patch.2+fsp.3.6.0|
43+
|r_ether to FreeRTOS+TCP Wrapper|v3.6.0|
44+
|Ethernet|v3.6.0|
45+
|Ethernet PHY|v3.6.0|
46+
|FreeRTOS+TCP|v2.3.2-LTS.Patch.1+fsp.3.6.0|
47+
|FreeRTOS - Buffer Allocation 2|v2.3.2-LTS.Patch.1+fsp.3.6.0|
4848

4949
## Setup Steps and Build wolfSSL Library
5050

@@ -168,7 +168,7 @@ $./examples/server/server -b -d -i
168168
169169
ECDSA sign and verify use, launch server with the following option
170170
```
171-
$./examples/server/server -b -d -c -i ./certs/server-ecc.pem -k ./certs/ecc-key.pem
171+
$./examples/server/server -b -d -i -c ./certs/server-ecc.pem -k ./certs/ecc-key.pem
172172
```
173173
174174
5.) Run the example Client

‎IDE/Renesas/e2studio/RA6M4/common/user_settings.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,3 +78,7 @@
7878
#if defined(WOLFSSL_RENESAS_SCEPROTECT) && defined(SCEKEY_INSTALLED)
7979
#define HAVE_RENESAS_SYNC
8080
#endif
81+
82+
#if defined(WOLFSSL_RENESAS_SCEPROTECT_CRYPTONLY)
83+
#define WOLFSSL_KEY_GEN
84+
#endif

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

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -72,32 +72,32 @@ const st_user_key_block_data_t g_key_block_data =
7272
* This is used for Root Certificate verify by SCE */
7373
const unsigned char ca_cert_der_sign[] =
7474
{
75-
0x0E, 0x7F, 0xB2, 0x0B, 0x4E, 0x8C, 0x11, 0x5E, 0xAC, 0xD7,
76-
0x77, 0x3D, 0x9E, 0xA0, 0x4B, 0xA5, 0xE2, 0x9F, 0x97, 0xEB,
77-
0xD0, 0x1B, 0x65, 0x08, 0x7D, 0x39, 0x2E, 0xD0, 0x97, 0x19,
78-
0xB6, 0x47, 0xF4, 0xCC, 0xA0, 0x24, 0xFA, 0xA6, 0x08, 0x11,
79-
0xF4, 0xDC, 0x82, 0xCC, 0xB6, 0x14, 0xF1, 0x4A, 0x63, 0x67,
80-
0xF2, 0x87, 0x0C, 0xA9, 0x31, 0x03, 0xAF, 0xD5, 0x4B, 0x1B,
81-
0xD9, 0x99, 0x6E, 0xB4, 0xBD, 0xAB, 0x7F, 0x64, 0xB8, 0x8B,
82-
0xFF, 0x45, 0xFC, 0xE5, 0x86, 0xE8, 0x95, 0x4E, 0xBD, 0x7F,
83-
0x21, 0xB5, 0xCD, 0x25, 0x85, 0x16, 0x32, 0x6C, 0x8A, 0xC5,
84-
0xE7, 0xEB, 0x58, 0xA8, 0xCC, 0xD2, 0x33, 0xFC, 0xBB, 0x88,
85-
0xBC, 0x15, 0xDB, 0xDD, 0x6B, 0x15, 0xE3, 0x43, 0x31, 0xA9,
86-
0xA2, 0x2E, 0x9C, 0x8C, 0x44, 0x69, 0x1A, 0x72, 0x49, 0xAD,
87-
0x94, 0x8B, 0xD9, 0xA7, 0x47, 0x91, 0xA1, 0xF0, 0xAA, 0xA4,
88-
0xAB, 0x5B, 0xC9, 0x8F, 0x48, 0xFE, 0x6B, 0x06, 0x7A, 0xF0,
89-
0xC0, 0x39, 0xEF, 0xF1, 0x38, 0x96, 0x03, 0xC8, 0xDC, 0xBE,
90-
0xF7, 0xDB, 0xBA, 0x09, 0xA4, 0x62, 0xD1, 0x39, 0xAD, 0x1D,
91-
0xEB, 0x28, 0x85, 0x53, 0x76, 0xF2, 0x52, 0x3B, 0x26, 0xF2,
92-
0x16, 0x01, 0xB0, 0xEF, 0x2B, 0x09, 0x2F, 0x30, 0x17, 0x6F,
93-
0x04, 0x5C, 0x75, 0xE5, 0x7D, 0xD0, 0xCB, 0x84, 0xDE, 0xEB,
94-
0x24, 0x45, 0x3D, 0x3A, 0x56, 0xC4, 0x64, 0x63, 0xD9, 0x00,
95-
0x23, 0x5F, 0xEE, 0xD9, 0x2E, 0xA9, 0xDC, 0x94, 0xA7, 0x8D,
96-
0xB6, 0xD9, 0xDF, 0x96, 0x8F, 0x8B, 0x81, 0x83, 0x8A, 0x8E,
97-
0x36, 0x45, 0xC7, 0xB7, 0x59, 0xA0, 0x9D, 0xE8, 0xFE, 0x62,
98-
0x5C, 0x7A, 0xF2, 0x9E, 0xF9, 0xB6, 0x75, 0x46, 0x44, 0x6D,
99-
0x96, 0xFC, 0x3E, 0xE2, 0x17, 0x52, 0x0D, 0x70, 0x37, 0xD9,
100-
0xAE, 0x1D, 0x25, 0x30, 0xF7, 0xD9
75+
0x19, 0xB4, 0xD1, 0x53, 0xBB, 0x87, 0x0B, 0xD8, 0xD8, 0xFC,
76+
0x22, 0x21, 0xA6, 0xC1, 0xE5, 0xB2, 0x7A, 0xEF, 0xAF, 0x89,
77+
0x8B, 0x92, 0xC9, 0x4E, 0x59, 0xF0, 0x0B, 0xAB, 0x24, 0x84,
78+
0x60, 0x2D, 0x81, 0x42, 0x4A, 0x05, 0x2F, 0x2D, 0xAB, 0x20,
79+
0x3F, 0x8D, 0xCA, 0x9F, 0x37, 0x4B, 0xDF, 0xE3, 0x2A, 0xA3,
80+
0x3F, 0x4E, 0x09, 0x20, 0x08, 0xD4, 0x46, 0xD9, 0xF0, 0xD8,
81+
0xA7, 0x43, 0x60, 0xE2, 0x1D, 0xF7, 0x25, 0x64, 0x38, 0xD2,
82+
0xB1, 0x4E, 0x1F, 0x84, 0xFC, 0xC5, 0x55, 0x2C, 0x1A, 0xA2,
83+
0xCE, 0x99, 0xD0, 0x21, 0x93, 0xA5, 0xDB, 0x6F, 0x14, 0x2C,
84+
0xDF, 0x9A, 0x01, 0x6A, 0x9A, 0xCC, 0xB0, 0x08, 0xD8, 0xCF,
85+
0xA8, 0x94, 0x41, 0x23, 0xBB, 0xC2, 0xA3, 0x8B, 0x77, 0x35,
86+
0x27, 0x0D, 0x94, 0x16, 0xF3, 0xCA, 0x16, 0xA2, 0x4C, 0x2F,
87+
0xB0, 0x8D, 0xE6, 0x38, 0xCC, 0x9C, 0x34, 0xE8, 0xDC, 0xDC,
88+
0x1C, 0x5C, 0x88, 0x52, 0x97, 0x47, 0xC6, 0xB6, 0x66, 0xCF,
89+
0xCE, 0xBF, 0xF0, 0x24, 0x19, 0x0F, 0x07, 0xA5, 0xC4, 0xC6,
90+
0x37, 0x0D, 0x2A, 0x11, 0x6A, 0x66, 0x64, 0x62, 0x0E, 0xE6,
91+
0xCB, 0xAF, 0xFB, 0x2E, 0x8E, 0x37, 0x1E, 0x6D, 0xD1, 0xAD,
92+
0xE4, 0x16, 0x06, 0xFB, 0x43, 0x2E, 0x4D, 0x64, 0x18, 0xB2,
93+
0x4C, 0xE7, 0xD3, 0xE9, 0x9B, 0x95, 0x13, 0x7D, 0x7D, 0x93,
94+
0xC2, 0x34, 0x43, 0x0C, 0xFF, 0x58, 0xD3, 0xA7, 0x21, 0x8E,
95+
0x2B, 0xB3, 0x36, 0x90, 0xF1, 0x1E, 0x0E, 0x87, 0x41, 0x48,
96+
0xC9, 0x69, 0x57, 0x89, 0xD0, 0xF7, 0x86, 0x47, 0x8F, 0xF5,
97+
0xA8, 0x13, 0x24, 0x0A, 0x7E, 0xE3, 0xBB, 0x9F, 0xF1, 0xDF,
98+
0x30, 0xE7, 0x88, 0x70, 0x8A, 0x46, 0xD9, 0x1A, 0x50, 0x42,
99+
0x4F, 0xCF, 0xC3, 0xCB, 0xCF, 0xE4, 0xA7, 0xA3, 0x74, 0x0A,
100+
0xDE, 0x14, 0xAF, 0xA5, 0x7F, 0xE2
101101
};
102102

103103
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);
108108
*/
109109
const unsigned char ca_ecc_cert_der_sign[] =
110110
{
111-
0x41, 0xFC, 0x2C, 0xFD, 0x21, 0xFB, 0xF2, 0x98, 0xF3, 0x25,
112-
0x06, 0x8C, 0x2C, 0x4A, 0x12, 0xDB, 0xDD, 0x38, 0x39, 0x83,
113-
0xD5, 0x80, 0xB4, 0x52, 0xA5, 0x35, 0xA6, 0x5C, 0x38, 0x41,
114-
0xDA, 0xBE, 0x64, 0x84, 0x7C, 0x63, 0x7D, 0x2A, 0xBB, 0xB9,
115-
0x93, 0xED, 0x27, 0xE3, 0x2B, 0xAB, 0xC4, 0xBC, 0x08, 0xBE,
116-
0xA6, 0xF7, 0x40, 0xA3, 0x1E, 0xB1, 0x8C, 0xF8, 0x4B, 0x78,
117-
0x9F, 0xFE, 0xAA, 0x86, 0x15, 0xF5, 0xDD, 0xB3, 0xCD, 0xF5,
118-
0x3A, 0x81, 0x26, 0x3E, 0x04, 0x05, 0x65, 0xF9, 0x53, 0x8E,
119-
0x10, 0x1F, 0xE8, 0xD9, 0x3F, 0xA1, 0x6E, 0x8C, 0xAD, 0xFA,
120-
0x50, 0x36, 0xFE, 0x89, 0x4E, 0xAC, 0x27, 0xDB, 0x59, 0x80,
121-
0xE3, 0x77, 0x20, 0x4F, 0xC1, 0x03, 0xA4, 0x1D, 0xE5, 0x34,
122-
0xCB, 0x8F, 0x88, 0xD6, 0x38, 0x2A, 0x31, 0xE0, 0xC2, 0xAA,
123-
0x78, 0x34, 0x9C, 0xFE, 0x8F, 0x8D, 0x76, 0xDB, 0x24, 0x38,
124-
0xE1, 0xAB, 0xAE, 0xBA, 0xD0, 0xA9, 0x1C, 0x59, 0x01, 0xE3,
125-
0x49, 0x9B, 0x13, 0x7D, 0x25, 0x7C, 0x8D, 0x12, 0x36, 0xA1,
126-
0xEF, 0x7B, 0xD4, 0x16, 0x58, 0x3A, 0x0E, 0xE7, 0x5A, 0x36,
127-
0xDD, 0xD4, 0x31, 0x23, 0xBF, 0xC9, 0x49, 0x62, 0xA4, 0x01,
128-
0xA3, 0xAC, 0x62, 0xAB, 0xA0, 0x48, 0xE3, 0xDA, 0x72, 0xD3,
129-
0x6D, 0xF3, 0x57, 0x61, 0x9E, 0xEA, 0x31, 0xA7, 0x82, 0xDD,
130-
0x79, 0x3C, 0x8E, 0x01, 0xE9, 0xE5, 0xB2, 0x49, 0x2F, 0x3F,
131-
0x3F, 0x16, 0x2C, 0xCC, 0x3D, 0x78, 0x6E, 0xB6, 0x6D, 0x34,
132-
0x38, 0x46, 0xCC, 0xFF, 0xEF, 0x26, 0x74, 0xD8, 0x68, 0x90,
133-
0xF1, 0x2A, 0xAA, 0xF3, 0xF3, 0x5A, 0xFC, 0x75, 0x00, 0xE6,
134-
0x11, 0xE7, 0x21, 0x05, 0x6B, 0xAA, 0x53, 0x25, 0x59, 0x33,
135-
0xB0, 0xC0, 0x66, 0x14, 0x2F, 0x00, 0x59, 0xF3, 0xFF, 0x5E,
136-
0xCC, 0x10, 0x84, 0x0E, 0xE6, 0x17
111+
0x66, 0x96, 0xB4, 0x9F, 0x0B, 0x56, 0x60, 0x1F, 0x01, 0x7A,
112+
0xDE, 0x65, 0xD6, 0x8C, 0x2A, 0xE2, 0x20, 0xA0, 0xE8, 0x19,
113+
0x99, 0x70, 0x8B, 0x17, 0x1B, 0xDA, 0x8C, 0x3A, 0x87, 0x07,
114+
0xE7, 0xF9, 0x1B, 0x7C, 0xC1, 0x32, 0x55, 0x38, 0x15, 0x9C,
115+
0x7B, 0x89, 0xDA, 0x9D, 0x57, 0x80, 0x50, 0xCF, 0xA6, 0x4C,
116+
0x51, 0x71, 0xBA, 0x52, 0xFA, 0x58, 0x4C, 0xE7, 0x33, 0x08,
117+
0xB9, 0xE7, 0x5F, 0x7E, 0x8A, 0x1D, 0xCC, 0xA8, 0x4A, 0xA9,
118+
0xAF, 0xE5, 0xA1, 0x87, 0x59, 0xD0, 0xF7, 0x23, 0xAE, 0xC5,
119+
0x42, 0x99, 0xFA, 0x4A, 0xAB, 0xFA, 0x08, 0xF9, 0x7C, 0x8D,
120+
0xD3, 0xB1, 0xF7, 0xD8, 0x01, 0x3C, 0x06, 0xD5, 0x2C, 0xBF,
121+
0x18, 0xF1, 0x45, 0x47, 0x5D, 0xA4, 0x7F, 0x90, 0x4E, 0x0C,
122+
0x86, 0x41, 0x5F, 0x26, 0x25, 0x8B, 0x8A, 0xD8, 0x3F, 0x4B,
123+
0xAF, 0xD5, 0xBE, 0xD9, 0xC6, 0x46, 0x2A, 0x2B, 0xC3, 0x10,
124+
0x93, 0xCB, 0x1E, 0xFB, 0x3D, 0x8A, 0x39, 0xB6, 0x03, 0x9D,
125+
0xC2, 0x16, 0xA1, 0xB5, 0x9C, 0x0D, 0x05, 0x5E, 0x1B, 0x30,
126+
0x9F, 0x53, 0xEE, 0xF2, 0x27, 0xE1, 0xE3, 0x2F, 0xD9, 0xEB,
127+
0xF2, 0xFE, 0xD3, 0x6C, 0x71, 0xCE, 0x28, 0x56, 0x9F, 0x85,
128+
0x34, 0xAD, 0x9D, 0x3D, 0x22, 0x3A, 0x33, 0x3B, 0x9F, 0x55,
129+
0x4F, 0x10, 0xA9, 0xD2, 0xAB, 0xE0, 0x29, 0x7A, 0x09, 0xF3,
130+
0x4E, 0xC1, 0x21, 0xA7, 0xF4, 0xE5, 0x34, 0x6D, 0x68, 0x36,
131+
0xE9, 0x7B, 0xD4, 0x42, 0x0A, 0xBC, 0xC4, 0x1F, 0x6C, 0x58,
132+
0xB6, 0x65, 0x3F, 0x9F, 0x92, 0x65, 0xF9, 0x83, 0x7A, 0x94,
133+
0x66, 0x7C, 0xB2, 0x03, 0x16, 0x65, 0x9E, 0xBF, 0x8C, 0x77,
134+
0xB8, 0xA4, 0x13, 0x8B, 0xD3, 0x82, 0x39, 0x94, 0xD1, 0x2A,
135+
0xE3, 0x3E, 0x51, 0xEB, 0x56, 0xE2, 0x92, 0x5C, 0x6B, 0xD1,
136+
0x30, 0xD1, 0x91, 0x77, 0x6E, 0x28
137137
};
138138
static const int sizeof_ca_ecc_cert_der_sign = sizeof(ca_ecc_cert_der_sign);
139139
#endif /* USE_CERT_BUFFERS_256 */

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

Lines changed: 78 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
#include <wolfssl/wolfcrypt/settings.h>
2626
#include <wolfssl/wolfcrypt/types.h>
2727

28-
#if defined(WOLFSSL_RENESAS_SCEPROTECT)
28+
#if defined(WOLFSSL_RENESAS_SCEPROTECT) || \
29+
defined(WOLFSSL_RENESAS_SCEPROTECT_CRYPTONLY)
2930
#include <wolfssl/wolfcrypt/port/Renesas/renesas-sce-crypt.h>
3031
#if defined(TLS_MULTITHREAD_TEST)
3132
User_SCEPKCbInfo guser_PKCbInfo_taskA;
@@ -127,10 +128,42 @@ static void my_Logging_cb(const int logLevel, const char *const logMessage)
127128
}
128129
#endif
129130

131+
void Clr_CallbackCtx(User_SCEPKCbInfo *g)
132+
{
133+
if (g->sce_wrapped_key_aes256 != NULL)
134+
XFREE(g->sce_wrapped_key_aes256,
135+
NULL, DYNAMIC_TYPE_TMP_BUFFER);
136+
137+
if (g->sce_wrapped_key_aes128 != NULL)
138+
XFREE(g->sce_wrapped_key_aes128,
139+
NULL, DYNAMIC_TYPE_TMP_BUFFER);
140+
141+
#if defined(WOLFSSL_RENESAS_SCEPROTECT_CRYPTONLY)
142+
if (g->sce_wrapped_key_rsapri2048 != NULL)
143+
XFREE(g->sce_wrapped_key_rsapri2048,
144+
NULL, DYNAMIC_TYPE_TMP_BUFFER);
145+
146+
if (g->sce_wrapped_key_rsapub2048 != NULL)
147+
XFREE(g->sce_wrapped_key_rsapub2048,
148+
NULL, DYNAMIC_TYPE_TMP_BUFFER);
149+
150+
if (g->sce_wrapped_key_rsapri1024 != NULL)
151+
XFREE(g->sce_wrapped_key_rsapri1024,
152+
NULL, DYNAMIC_TYPE_TMP_BUFFER);
153+
154+
if (g->sce_wrapped_key_rsapub2048 != NULL)
155+
XFREE(g->sce_wrapped_key_rsapub1024,
156+
NULL, DYNAMIC_TYPE_TMP_BUFFER);
157+
#endif
158+
XMEMSET(g, 0, sizeof(User_SCEPKCbInfo));
159+
}
160+
130161
void sce_test(void)
131162
{
132163

133-
#if defined(SCE_CRYPT_UNIT_TEST) && defined(WOLFSSL_RENESAS_SCEPROTECT)
164+
#if defined(SCE_CRYPT_UNIT_TEST) && \
165+
(defined(WOLFSSL_RENESAS_SCEPROTECT) || \
166+
defined(WOLFSSL_RENESAS_SCEPROTECT_CRYPTONLY))
134167
int ret = 0;
135168
BaseType_t xRet;
136169

@@ -169,7 +202,9 @@ void sce_test(void)
169202
printf("wolfCrypt_Cleanup failed %d\n", ret);
170203
}
171204

172-
#elif defined(CRYPT_TEST)
205+
#elif defined(CRYPT_TEST) && \
206+
(defined(WOLFSSL_RENESAS_SCEPROTECT) || \
207+
defined(WOLFSSL_RENESAS_SCEPROTECT_CRYPTONLY))
173208
int ret;
174209
func_args args = { 0 };
175210

@@ -185,7 +220,11 @@ void sce_test(void)
185220
printf("wolfCrypt_Cleanup failed %d\n", ret);
186221
}
187222

188-
#elif defined(BENCHMARK)
223+
Clr_CallbackCtx(&guser_PKCbInfo);
224+
225+
#elif defined(BENCHMARK) && \
226+
(defined(WOLFSSL_RENESAS_SCEPROTECT) || \
227+
defined(WOLFSSL_RENESAS_SCEPROTECT_CRYPTONLY))
189228
#include "hal_data.h"
190229
#include "r_sce.h"
191230

@@ -194,25 +233,46 @@ void sce_test(void)
194233
#if defined(WOLFSSL_RENESAS_SCEPROTECT) && defined(SCEKEY_INSTALLED)
195234

196235
/* aes 256 */
197-
memcpy(guser_PKCbInfo.sce_wrapped_key_aes256.value,
198-
(uint32_t *)DIRECT_KEY_ADDRESS_256,
199-
HW_SCE_AES256_KEY_INDEX_WORD_SIZE*4);
200-
guser_PKCbInfo.sce_wrapped_key_aes256.type = SCE_KEY_INDEX_TYPE_AES256;
201-
guser_PKCbInfo.aes256_installedkey_set = 1;
202-
203-
/* aes 128 */
204-
memcpy(guser_PKCbInfo.sce_wrapped_key_aes128.value,
205-
(uint32_t *)DIRECT_KEY_ADDRESS_128,
206-
HW_SCE_AES128_KEY_INDEX_WORD_SIZE*4);
207-
208-
guser_PKCbInfo.sce_wrapped_key_aes128.type = SCE_KEY_INDEX_TYPE_AES128;
209-
guser_PKCbInfo.aes128_installedkey_set = 1;
210-
236+
XMEMSET(&guser_PKCbInfo, 0, sizeof(guser_PKCbInfo));
237+
sce_aes_wrapped_key_t *p1 = NULL;
238+
sce_aes_wrapped_key_t *p2 = NULL;
239+
240+
guser_PKCbInfo.sce_wrapped_key_aes256 =
241+
(sce_aes_wrapped_key_t*)XMALLOC(sizeof(sce_aes_wrapped_key_t),
242+
NULL, DYNAMIC_TYPE_TMP_BUFFER);
243+
p1 = (sce_aes_wrapped_key_t*)guser_PKCbInfo.sce_wrapped_key_aes256;
244+
245+
guser_PKCbInfo.sce_wrapped_key_aes128 =
246+
(sce_aes_wrapped_key_t*)XMALLOC(sizeof(sce_aes_wrapped_key_t),
247+
NULL, DYNAMIC_TYPE_TMP_BUFFER);
248+
p2 = (sce_aes_wrapped_key_t*)guser_PKCbInfo.sce_wrapped_key_aes128;
249+
250+
if ( p1 == NULL || p2 == NULL) {
251+
printf("failed to alloc memory!");
252+
}
253+
else {
254+
memcpy(p1->value,
255+
(uint32_t *)DIRECT_KEY_ADDRESS_256,
256+
HW_SCE_AES256_KEY_INDEX_WORD_SIZE*4);
257+
p1->type = SCE_KEY_INDEX_TYPE_AES256;
258+
guser_PKCbInfo.keyflgs_crypt.bits.aes256_installedkey_set = 1;
259+
260+
/* aes 128 */
261+
memcpy(p2->value,
262+
(uint32_t *)DIRECT_KEY_ADDRESS_128,
263+
HW_SCE_AES128_KEY_INDEX_WORD_SIZE*4);
264+
265+
p2->type = SCE_KEY_INDEX_TYPE_AES128;
266+
guser_PKCbInfo.keyflgs_crypt.bits.aes128_installedkey_set = 1;
267+
}
211268
#endif
212269
printf("Start wolfCrypt Benchmark\n");
213270
benchmark_test(NULL);
214271
printf("End wolfCrypt Benchmark\n");
215272

273+
/* free */
274+
Clr_CallbackCtx(&guser_PKCbInfo);
275+
216276
#elif defined(TLS_CLIENT)
217277
#include "hal_data.h"
218278
#include "r_sce.h"

0 commit comments

Comments
 (0)