Skip to content

Commit e91b623

Browse files
cconloncconlon
authored
Merge pull request #6792 from miyazakh/renesas_ra6m4_r
Fix ra6m4 port
2 parents 5bc5b8a + 8f9c371 commit e91b623

16 files changed

Lines changed: 649 additions & 408 deletions

File tree

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
/* XXX_CRYPTONLY definition enables FSP SM module for Crypto only use.
3434
* Therefore, it disables TLS related API use
3535
*/
36-
/* # define WOLFSSL_RENESAS_SCEPROTECT_CRYPTONLY */
36+
/* #define WOLFSSL_RENESAS_SCEPROTECT_CRYPTONLY */
3737

3838
#if defined(WOLFSSL_RENESAS_SCEPROTECT_CRYPTONLY)
3939
#undef WOLFSSL_RENESAS_FSPSM_TLS
@@ -51,6 +51,7 @@
5151
#define NO_MAIN_DRIVER
5252
#define BENCH_EMBEDDED
5353
#define NO_WRITEV
54+
#define WOLFSSL_NO_FLOAT_FMT
5455

5556
#define NO_DEV_RANDOM
5657
#define SIZEOF_LONG_LONG 8
@@ -102,10 +103,11 @@
102103
#endif
103104

104105
#define WOLF_CRYPTO_CB
105-
/* Enable SCEKEY_INSTALLED if keys are installed */
106-
#define SCEKEY_INSTALLED
107-
#if defined(WOLFSSL_RENESAS_SCEPROTECT) && defined(SCEKEY_INSTALLED)
106+
#if defined(WOLFSSL_RENESAS_SCEPROTECT_CRYPTONLY)
108107
#define HAVE_RENESAS_SYNC
108+
#define WC_USE_DEVID 7890
109+
#define NO_AES_192
110+
#define NO_SW_BENCH
109111
#endif
110112

111113
#if defined(WOLFSSL_RENESAS_SCEPROTECT_CRYPTONLY)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#define DIRECT_KEY_ADDRESS_128 FLASH_HP_DF_BLOCK_2
3737

3838
/* Client connects to the server with these details. */
39-
#define SERVER_IP "192.168.11.49"
39+
#define SERVER_IP "192.168.11.4"
4040
#define DEFAULT_PORT 11111
4141

4242
/* Enable wolfcrypt test */
@@ -45,7 +45,7 @@
4545

4646
/* Enable benchmark */
4747
/* can be enabled with cyrpt test */
48-
/*#define BENCHMARK*/
48+
/* #define BENCHMARK */
4949

5050
/* Enable TLS client */
5151
/* cannot enable with CRYPT_TEST or BENCHMARK */

‎IDE/Renesas/e2studio/RA6M4/test/.cproject‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.floatequal.178955027" name="Warn if floats are compared as equal (-Wfloat-equal)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.floatequal" useByScannerDiscovery="true" value="true" valueType="boolean"/>
4141
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.toolchain.name.1177346912" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.toolchain.name" useByScannerDiscovery="false" value="GNU Tools for ARM Embedded Processors" valueType="string"/>
4242
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.1658562819" name="Architecture" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.architecture" useByScannerDiscovery="false" value="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.arm" valueType="enumerated"/>
43-
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.family.2007288726" name="ARM family" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.family" useByScannerDiscovery="false" value="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.mcpu.cortex-m33" valueType="enumerated"/>
43+
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.family.2007288726" name="Arm family (-mcpu)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.family" useByScannerDiscovery="false" value="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.mcpu.cortex-m33" valueType="enumerated"/>
4444
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.instructionset.1355173081" name="Instruction set" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.instructionset" useByScannerDiscovery="false" value="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.instructionset.thumb" valueType="enumerated"/>
4545
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.prefix.1436314985" name="Prefix" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.prefix" useByScannerDiscovery="false" value="arm-none-eabi-" valueType="string"/>
4646
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.c.1433936598" name="C compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.c" useByScannerDiscovery="false" value="gcc" valueType="string"/>
@@ -54,7 +54,7 @@
5454
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.fpu.unit.471325724" name="FPU Type" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.fpu.unit" useByScannerDiscovery="true" value="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.fpu.unit.fpv5spd16" valueType="enumerated"/>
5555
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.fpu.abi.1503256330" name="Float ABI" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.fpu.abi" useByScannerDiscovery="true" value="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.fpu.abi.hard" valueType="enumerated"/>
5656
<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform.811017489" isAbstract="false" osList="all" superClass="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform"/>
57-
<builder buildPath="${workspace_loc:/test_RA6M4}/Debug" id="com.renesas.cdt.managedbuild.gnuarm.builder.608777168" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.renesas.cdt.managedbuild.gnuarm.builder"/>
57+
<builder buildPath="${workspace_loc:/test_RA6M4}/Debug" id="com.renesas.cdt.managedbuild.gnuarm.builder.608777168" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make ビルダー" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.renesas.cdt.managedbuild.gnuarm.builder"/>
5858
<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.2061639686" name="GNU ARM Cross Assembler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler">
5959
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor.1479290947" name="Use preprocessor" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor" useByScannerDiscovery="false" value="true" valueType="boolean"/>
6060
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.paths.732220121" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.paths" useByScannerDiscovery="true" valueType="includePath">
@@ -94,7 +94,7 @@
9494
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/wolfSSL_RA6M4/ra/fsp/inc/api}&quot;"/>
9595
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/wolfSSL_RA6M4/ra/fsp/inc/instances}&quot;"/>
9696
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/wolfSSL_RA6M4/ra/fsp/src/rm_freertos_port}&quot;"/>
97-
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/wolfSSL_RA6M4/ra/aws/amazon-freertos/freertos_kernel/include}&quot;"/>
97+
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/wolfSSL_RA6M4/ra/aws/FreeRTOS/FreeRTOS/Source/include}&quot;"/>
9898
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/wolfSSL_RA6M4/ra/arm/CMSIS_5/CMSIS/Core/Include}&quot;"/>
9999
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/wolfSSL_RA6M4/ra_gen}&quot;"/>
100100
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/wolfSSL_RA6M4/ra_cfg/fsp_cfg/bsp}&quot;"/>
@@ -103,8 +103,8 @@
103103
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/wolfSSL_RA6M4/ra/fsp/src/r_sce_protected/crypto_procedures_protected/src/sce9/inc/api}&quot;"/>
104104
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/wolfSSL_RA6M4/ra/fsp/src/r_sce_protected/crypto_procedures_protected/src/sce9/inc/instances}&quot;"/>
105105
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/wolfSSL_RA6M4/ra/fsp/src/r_sce_protected/crypto_procedures_protected/src/sce9/private/inc}&quot;"/>
106+
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/wolfSSL_RA6M4/ra/aws/FreeRTOS/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/include}&quot;"/>
106107
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/wolfSSL_RA6M4/ra/fsp/src/rm_freertos_plus_tcp}&quot;"/>
107-
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/wolfSSL_RA6M4/ra/aws/amazon-freertos/libraries/freertos_plus/standard/freertos_plus_tcp/include}&quot;"/>
108108
</option>
109109
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs.1484044149" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs" useByScannerDiscovery="true" valueType="definedSymbols">
110110
<listOptionValue builtIn="false" value="_RENESAS_RA_"/>
@@ -203,7 +203,7 @@
203203
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.floatequal.1063751013" name="Warn if floats are compared as equal (-Wfloat-equal)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.floatequal" useByScannerDiscovery="true" value="true" valueType="boolean"/>
204204
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.toolchain.name.1910016626" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.toolchain.name" value="GNU Tools for ARM Embedded Processors" valueType="string"/>
205205
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.801840864" name="Architecture" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.architecture" value="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.arm" valueType="enumerated"/>
206-
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.family.2047222938" name="ARM family" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.family" value="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.mcpu.cortex-m33" valueType="enumerated"/>
206+
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.family.2047222938" name="Arm family (-mcpu)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.family" value="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.mcpu.cortex-m33" valueType="enumerated"/>
207207
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.instructionset.2111760464" name="Instruction set" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.instructionset" value="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.instructionset.thumb" valueType="enumerated"/>
208208
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.prefix.245261797" name="Prefix" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.prefix" value="arm-none-eabi-" valueType="string"/>
209209
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.c.1373152617" name="C compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.c" value="gcc" valueType="string"/>
@@ -217,7 +217,7 @@
217217
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.fpu.unit.1442836615" name="FPU Type" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.fpu.unit" value="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.fpu.unit.fpv5spd16" valueType="enumerated"/>
218218
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.fpu.abi.1821706502" name="Float ABI" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.fpu.abi" value="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.fpu.abi.hard" valueType="enumerated"/>
219219
<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform.1380043931" isAbstract="false" osList="all" superClass="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform"/>
220-
<builder buildPath="${workspace_loc:/test_RA6M4}/Release" id="com.renesas.cdt.managedbuild.gnuarm.builder.874881970" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.renesas.cdt.managedbuild.gnuarm.builder"/>
220+
<builder buildPath="${workspace_loc:/test_RA6M4}/Release" id="com.renesas.cdt.managedbuild.gnuarm.builder.874881970" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make ビルダー" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.renesas.cdt.managedbuild.gnuarm.builder"/>
221221
<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.655483094" name="GNU ARM Cross Assembler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler">
222222
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor.513875977" name="Use preprocessor" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor" value="true" valueType="boolean"/>
223223
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.paths.671461231" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.paths" valueType="includePath">
@@ -331,4 +331,5 @@
331331
</storageModule>
332332
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
333333
<storageModule moduleId="refreshScope"/>
334+
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
334335
</cproject>

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

Lines changed: 63 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,6 @@ void abort(void);
4848

4949
#if defined(SCE_CRYPT_UNIT_TEST)
5050
int sce_crypt_test();
51-
int sce_crypt_sha256_multitest();
52-
int sce_crypt_AesCbc_multitest();
53-
int sce_crypt_AesGcm_multitest();
54-
int sce_crypt_Sha_AesCbcGcm_multitest();
55-
void tskSha256_Test1(void *pvParam);
5651
#endif
5752

5853
void R_BSP_WarmStart(bsp_warm_start_event_t event);
@@ -129,18 +124,32 @@ static void my_Logging_cb(const int logLevel, const char *const logMessage)
129124
#endif
130125

131126
#if defined(WOLFSSL_RENESAS_SCEPROTECT)
127+
void Clr_CallbackCtx(FSPSM_ST *g);
128+
void SCE_KeyGeneration(FSPSM_ST *g);
129+
130+
void SCE_KeyGeneration(FSPSM_ST *g)
131+
{
132+
fsp_err_t err = FSP_SUCCESS;
133+
134+
if (g->wrapped_key_aes128 != NULL) {
135+
err = R_SCE_AES128_WrappedKeyGenerate(g->wrapped_key_aes128);
136+
if (err == FSP_SUCCESS)
137+
g->keyflgs_crypt.bits.aes128_installedkey_set = 1;
138+
}
139+
140+
if (g->wrapped_key_aes256 != NULL) {
141+
err = R_SCE_AES256_WrappedKeyGenerate(g->wrapped_key_aes256);
142+
if (err == FSP_SUCCESS)
143+
g->keyflgs_crypt.bits.aes256_installedkey_set = 1;
144+
}
145+
146+
147+
}
148+
132149
void Clr_CallbackCtx(FSPSM_ST *g)
133150
{
134151
(void) g;
135152

136-
if (g->wrapped_key_aes256 != NULL)
137-
XFREE(g->wrapped_key_aes256,
138-
NULL, DYNAMIC_TYPE_TMP_BUFFER);
139-
140-
if (g->wrapped_key_aes128 != NULL)
141-
XFREE(g->wrapped_key_aes128,
142-
NULL, DYNAMIC_TYPE_TMP_BUFFER);
143-
144153
#if defined(WOLFSSL_RENESAS_SCEPROTECT_CRYPTONLY)
145154
if (g->wrapped_key_rsapri2048 != NULL)
146155
XFREE(g->wrapped_key_rsapri2048,
@@ -158,7 +167,7 @@ void Clr_CallbackCtx(FSPSM_ST *g)
158167
XFREE(g->wrapped_key_rsapub1024,
159168
NULL, DYNAMIC_TYPE_TMP_BUFFER);
160169
#endif
161-
XMEMSET(g, 0, sizeof(User_SCEPKCbInfo));
170+
XMEMSET(g, 0, sizeof(FSPSM_ST));
162171
}
163172
#endif
164173

@@ -179,25 +188,6 @@ void sce_test(void)
179188
printf(" simple crypt test by using SCE\n");
180189
sce_crypt_test();
181190

182-
printf(" \n");
183-
printf(" multi sha thread test\n");
184-
185-
sce_crypt_sha256_multitest();
186-
187-
printf(" \n");
188-
printf(" multi aes cbc thread test\n");
189-
190-
sce_crypt_AesCbc_multitest();
191-
192-
printf(" \n");
193-
printf(" multi aes gcm thread test\n");
194-
195-
sce_crypt_AesGcm_multitest();
196-
197-
printf(" \n");
198-
printf(" multi sha aescbc aesgcm thread test\n");
199-
sce_crypt_Sha_AesCbcGcm_multitest();
200-
201191
printf(" \n");
202192
printf("End wolf sce crypt Test\n");
203193

@@ -215,6 +205,26 @@ void sce_test(void)
215205
printf("wolfCrypt_Init failed %d\n", ret);
216206
}
217207

208+
#if defined(HAVE_RENESAS_SYNC) && \
209+
defined(HAVE_AES_CBC)
210+
211+
Clr_CallbackCtx(&guser_PKCbInfo);
212+
213+
#if defined(WOLFSSL_AES_128)
214+
sce_aes_wrapped_key_t user_aes128_key_index;
215+
guser_PKCbInfo.wrapped_key_aes128 = &user_aes128_key_index;
216+
#endif
217+
218+
#if defined(WOLFSSL_AES_256)
219+
sce_aes_wrapped_key_t user_aes256_key_index;
220+
guser_PKCbInfo.wrapped_key_aes256 = &user_aes256_key_index;
221+
#endif
222+
/* Generate Wrapped aes key */
223+
SCE_KeyGeneration(&guser_PKCbInfo);
224+
#endif
225+
226+
227+
218228
printf("Start wolfCrypt Test\n");
219229
wolfcrypt_test(args);
220230
printf("End wolfCrypt Test\n");
@@ -231,44 +241,29 @@ void sce_test(void)
231241
#include "hal_data.h"
232242
#include "r_sce.h"
233243

234-
printf("Prepare Installed key\n");
235-
236-
#if defined(WOLFSSL_RENESAS_SCEPROTECT) && defined(SCEKEY_INSTALLED)
237-
238-
/* aes 256 */
239-
XMEMSET(&guser_PKCbInfo, 0, sizeof(guser_PKCbInfo));
240-
sce_aes_wrapped_key_t *p1 = NULL;
241-
sce_aes_wrapped_key_t *p2 = NULL;
244+
int ret;
245+
if ((ret = wolfCrypt_Init()) != 0) {
246+
printf("wolfCrypt_Init failed %d\n", ret);
247+
}
248+
249+
#if defined(HAVE_RENESAS_SYNC) && \
250+
defined(HAVE_AES_CBC)
242251

243-
guser_PKCbInfo.wrapped_key_aes256 =
244-
(sce_aes_wrapped_key_t*)XMALLOC(sizeof(sce_aes_wrapped_key_t),
245-
NULL, DYNAMIC_TYPE_TMP_BUFFER);
246-
p1 = (sce_aes_wrapped_key_t*)guser_PKCbInfo.wrapped_key_aes256;
252+
Clr_CallbackCtx(&guser_PKCbInfo);
247253

248-
guser_PKCbInfo.wrapped_key_aes128 =
249-
(sce_aes_wrapped_key_t*)XMALLOC(sizeof(sce_aes_wrapped_key_t),
250-
NULL, DYNAMIC_TYPE_TMP_BUFFER);
251-
p2 = (sce_aes_wrapped_key_t*)guser_PKCbInfo.wrapped_key_aes128;
254+
#if defined(WOLFSSL_AES_128)
255+
sce_aes_wrapped_key_t user_aes128_key_index;
256+
guser_PKCbInfo.wrapped_key_aes128 = &user_aes128_key_index;
257+
#endif
252258

253-
if ( p1 == NULL || p2 == NULL) {
254-
printf("failed to alloc memory!");
255-
}
256-
else {
257-
memcpy(p1->value,
258-
(uint32_t *)DIRECT_KEY_ADDRESS_256,
259-
HW_SCE_AES256_KEY_INDEX_WORD_SIZE*4);
260-
p1->type = SCE_KEY_INDEX_TYPE_AES256;
261-
guser_PKCbInfo.keyflgs_crypt.bits.aes256_installedkey_set = 1;
262-
263-
/* aes 128 */
264-
memcpy(p2->value,
265-
(uint32_t *)DIRECT_KEY_ADDRESS_128,
266-
HW_SCE_AES128_KEY_INDEX_WORD_SIZE*4);
267-
268-
p2->type = SCE_KEY_INDEX_TYPE_AES128;
269-
guser_PKCbInfo.keyflgs_crypt.bits.aes128_installedkey_set = 1;
270-
}
259+
#if defined(WOLFSSL_AES_256)
260+
sce_aes_wrapped_key_t user_aes256_key_index;
261+
guser_PKCbInfo.wrapped_key_aes256 = &user_aes256_key_index;
271262
#endif
263+
/* Generate Wrapped aes key */
264+
SCE_KeyGeneration(&guser_PKCbInfo);
265+
#endif
266+
272267
printf("Start wolfCrypt Benchmark\n");
273268
benchmark_test(NULL);
274269
printf("End wolfCrypt Benchmark\n");
@@ -415,7 +410,7 @@ void sce_test(void)
415410
}
416411
TCP_connect_retry = 0;
417412
i++;
418-
} while (i < cipherlist_sz && TCP_connect_retry < 5);
413+
} while (i < cipherlist_sz && TCP_connect_retry < 100);
419414

420415
#endif /* SCE_MULTITHREAD_TEST */
421416

0 commit comments

Comments
 (0)