Skip to content

Commit ac90fa8

Browse files
cconloncconlon
authored
Merge pull request #6701 from miyazakh/fspsm
generalize Renesas SCE Protected port
2 parents ec818e5 + 0d8f68e commit ac90fa8

30 files changed

Lines changed: 1076 additions & 822 deletions

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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,32 @@
1818
* along with this program; if not, write to the Free Software
1919
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
2020
*/
21+
#if defined(WOLFSSL_RENESAS_SCEPROTECT)
22+
/* FSP SM stands for Flexible Software Package Security Module
23+
* WOLFSSL_RENESAS_FSPSM enables fundamental code when it uses.
24+
* e.g. Open/Close/Random generator
25+
* WOLFSSL_RENESAS_FSPSPM_TLS enables TLS related code for FSP SM
26+
* e.g. Certificate verification, Master Secret Generation
27+
* WOLFSSL_RENESAS_SCEPROTECT enables specific code for SCE if needed
28+
*/
29+
#define WOLFSSL_RENESAS_FSPSM
30+
#define WOLFSSL_RENESAS_FSPSM_TLS
31+
#endif
32+
33+
/* XXX_CRYPTONLY definition enables FSP SM module for Crypto only use.
34+
* Therefore, it disables TLS related API use
35+
*/
36+
/* # define WOLFSSL_RENESAS_SCEPROTECT_CRYPTONLY */
37+
38+
#if defined(WOLFSSL_RENESAS_SCEPROTECT_CRYPTONLY)
39+
#undef WOLFSSL_RENESAS_FSPSM_TLS
40+
#define WOLFSSL_RENESAS_FSPSM_CRYPTONLY
41+
42+
#if !defined(WOLFSSL_RENESAS_SCEPROTECT)
43+
#define WOLFSSL_RENESAS_SCEPROTECT
44+
#endif
45+
#endif
46+
2147
/* Operating Environment and Threading */
2248
#define FREERTOS
2349
#define FREERTOS_TCP
@@ -61,6 +87,9 @@
6187
#define printf myprintf
6288
#endif
6389

90+
/* Enable the following definition to use TLS 1.3
91+
* For TLS1.3 use "extended-master" needs to turn on
92+
*/
6493
/* #define WOLFSSL_TLS13 */
6594

6695
#if defined(WOLFSSL_TLS13)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ typedef struct tagTestInfo
8282
void sce_test();
8383
void TCPInit();
8484
void wolfSSL_TLS_client_init();
85-
void wolfSSL_TLS_client_do(void *pvParam);
85+
int wolfSSL_TLS_client_do(void *pvParam);
8686
void wolfSSL_TLS_cleanup();
8787
extern WOLFSSL_CTX *client_ctx;
8888

‎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-
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
75+
0x70, 0x4D, 0x6C, 0xCC, 0xAD, 0xD0, 0x74, 0x34, 0x10, 0xB3,
76+
0x1F, 0x26, 0x49, 0x31, 0xD0, 0xD5, 0x0B, 0x4F, 0x50, 0xD4,
77+
0x21, 0x7D, 0x3D, 0xE6, 0x9D, 0x5A, 0xF1, 0xE4, 0x48, 0xBD,
78+
0x6D, 0xB3, 0x58, 0xB4, 0x07, 0xF1, 0x06, 0xA7, 0x3D, 0xB7,
79+
0x24, 0x60, 0xBD, 0x72, 0xB2, 0x7B, 0xA8, 0x4F, 0xFC, 0x47,
80+
0x64, 0xF0, 0x04, 0xBE, 0xC7, 0xAE, 0xB6, 0x6F, 0xA5, 0xD6,
81+
0x65, 0xE9, 0xB5, 0x3D, 0x8A, 0xC8, 0x27, 0x9A, 0x3B, 0x4C,
82+
0x98, 0xB0, 0x5F, 0x1E, 0x54, 0xA5, 0xEF, 0xBC, 0x61, 0xA7,
83+
0x3F, 0xB7, 0x5D, 0x36, 0x5A, 0x27, 0x1C, 0x5A, 0xAF, 0x65,
84+
0x7A, 0x89, 0x4F, 0x00, 0xB1, 0x75, 0xA7, 0xA9, 0x5C, 0xE8,
85+
0xC8, 0x0E, 0x5C, 0x83, 0x12, 0x47, 0x11, 0xD1, 0xBD, 0xF4,
86+
0x10, 0x7D, 0x7B, 0xD6, 0x05, 0xF7, 0xBE, 0xD2, 0x70, 0x05,
87+
0x56, 0xD6, 0x84, 0x70, 0x11, 0x3D, 0x67, 0x93, 0x2E, 0xB0,
88+
0x93, 0xBA, 0x34, 0xD0, 0xDE, 0xB8, 0x16, 0x7B, 0x0D, 0x67,
89+
0x16, 0x92, 0x91, 0x79, 0xAC, 0x3C, 0xC9, 0x4D, 0x8A, 0xEE,
90+
0x31, 0xCC, 0xFC, 0xF7, 0x78, 0xB3, 0x1B, 0x0F, 0x54, 0xCE,
91+
0xF4, 0xBB, 0xE7, 0xF4, 0xAC, 0x80, 0xEF, 0xDD, 0xFF, 0x84,
92+
0x7A, 0x37, 0xED, 0xC4, 0x45, 0x3D, 0x7C, 0x19, 0x81, 0x95,
93+
0x2E, 0x71, 0xE7, 0x1B, 0x1C, 0x75, 0x67, 0xBC, 0x62, 0x0F,
94+
0xAA, 0x90, 0x41, 0x01, 0x53, 0xD0, 0x3A, 0x6E, 0xE9, 0xC9,
95+
0xAA, 0x2F, 0xD1, 0xD8, 0xB3, 0x3B, 0x80, 0xCA, 0xE5, 0xA1,
96+
0x1B, 0x7F, 0xCF, 0xF5, 0xBF, 0x2C, 0x2B, 0xBE, 0x1F, 0x77,
97+
0x89, 0x21, 0xD7, 0x76, 0x51, 0xA8, 0xD0, 0x31, 0xE1, 0x97,
98+
0xD1, 0x63, 0x84, 0xA2, 0xAA, 0x6E, 0x9A, 0x33, 0x43, 0x65,
99+
0x2A, 0x6B, 0x40, 0x03, 0x84, 0x6F, 0xC7, 0xB3, 0xE5, 0xD8,
100+
0x64, 0x30, 0x12, 0x2A, 0x45, 0x1D
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-
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
111+
0xB9, 0x59, 0x94, 0xE6, 0xD1, 0x5B, 0xFD, 0x59, 0xBB, 0x4F,
112+
0x14, 0x0B, 0x9E, 0x30, 0x61, 0xF9, 0xFA, 0x2C, 0xD8, 0xE2,
113+
0x7F, 0xD0, 0x1F, 0x47, 0xDE, 0x14, 0x8E, 0xD1, 0x78, 0x86,
114+
0xA4, 0x9B, 0xDC, 0x86, 0x64, 0x2A, 0xD9, 0xBC, 0xBE, 0x61,
115+
0x60, 0xB8, 0x1C, 0x46, 0xCE, 0x66, 0x97, 0xC0, 0x32, 0x04,
116+
0x38, 0x3B, 0xCB, 0xB7, 0x38, 0x89, 0x11, 0xCE, 0xBA, 0x64,
117+
0xE1, 0xDD, 0x4E, 0x3C, 0x6F, 0xA0, 0x48, 0xFA, 0x9F, 0x8F,
118+
0xEC, 0x6A, 0xCA, 0xAC, 0x29, 0x4B, 0xD9, 0xF7, 0xE3, 0x03,
119+
0xF7, 0xBA, 0xB8, 0xCC, 0x2C, 0xD1, 0xC8, 0x84, 0xFA, 0xF6,
120+
0xFA, 0xE4, 0x72, 0xAF, 0x8D, 0x07, 0xF0, 0x3D, 0xD7, 0x58,
121+
0x95, 0x08, 0x6F, 0xD5, 0x77, 0x1B, 0x92, 0x81, 0x99, 0x69,
122+
0x5C, 0x4D, 0x8F, 0x98, 0xC6, 0x09, 0xC1, 0xEB, 0xB5, 0x86,
123+
0x87, 0x47, 0xD7, 0x68, 0x73, 0xE8, 0x1D, 0x1B, 0xFE, 0xA5,
124+
0x9C, 0x7A, 0x4B, 0xAD, 0x1A, 0x54, 0x46, 0xA0, 0xC8, 0xF7,
125+
0x6C, 0xDD, 0xA6, 0xEF, 0x16, 0x21, 0x18, 0xCE, 0xF8, 0xDE,
126+
0x3D, 0xB4, 0x56, 0x0C, 0xBA, 0xB7, 0x95, 0xD1, 0x6D, 0x0D,
127+
0x49, 0xE7, 0x78, 0x64, 0x65, 0xC7, 0x24, 0x26, 0x81, 0xCD,
128+
0x56, 0xB7, 0xB2, 0x31, 0xF2, 0xD7, 0x64, 0x55, 0x89, 0xCC,
129+
0xDB, 0x69, 0x56, 0xED, 0x9B, 0x07, 0x9E, 0xD4, 0x07, 0x5E,
130+
0xAF, 0xF0, 0x98, 0x94, 0xD6, 0x87, 0x0C, 0x22, 0xE1, 0x3A,
131+
0x88, 0xE1, 0xC4, 0xBC, 0x51, 0x4B, 0x07, 0x4D, 0x2A, 0xCE,
132+
0xA8, 0xE8, 0x9F, 0xF7, 0xA2, 0x8A, 0xEA, 0x90, 0x32, 0x20,
133+
0xFC, 0xB6, 0x32, 0xE6, 0x8A, 0x47, 0x2B, 0xF4, 0xB4, 0x0F,
134+
0x96, 0x7A, 0xC9, 0x0B, 0xF6, 0xBF, 0x69, 0x51, 0x9B, 0x44,
135+
0xC2, 0xE2, 0xD6, 0x2D, 0xB1, 0x17, 0xAC, 0x7B, 0x32, 0xF2,
136+
0x0E, 0x7A, 0x28, 0x67, 0xAB, 0xA5
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: 49 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727

2828
#if defined(WOLFSSL_RENESAS_SCEPROTECT) || \
2929
defined(WOLFSSL_RENESAS_SCEPROTECT_CRYPTONLY)
30-
#include <wolfssl/wolfcrypt/port/Renesas/renesas-sce-crypt.h>
30+
#include <wolfssl/wolfcrypt/port/Renesas/renesas-fspsm-crypt.h>
3131
#if defined(TLS_MULTITHREAD_TEST)
32-
User_SCEPKCbInfo guser_PKCbInfo_taskA;
33-
User_SCEPKCbInfo guser_PKCbInfo_taskB;
32+
FSPSM_ST guser_PKCbInfo_taskA;
33+
FSPSM_ST guser_PKCbInfo_taskB;
3434
#else
35-
User_SCEPKCbInfo guser_PKCbInfo;
35+
FSPSM_ST guser_PKCbInfo;
3636
#endif
3737
#endif
3838

@@ -128,35 +128,39 @@ static void my_Logging_cb(const int logLevel, const char *const logMessage)
128128
}
129129
#endif
130130

131-
void Clr_CallbackCtx(User_SCEPKCbInfo *g)
131+
#if defined(WOLFSSL_RENESAS_SCEPROTECT)
132+
void Clr_CallbackCtx(FSPSM_ST *g)
132133
{
133-
if (g->sce_wrapped_key_aes256 != NULL)
134-
XFREE(g->sce_wrapped_key_aes256,
134+
(void) g;
135+
136+
if (g->wrapped_key_aes256 != NULL)
137+
XFREE(g->wrapped_key_aes256,
135138
NULL, DYNAMIC_TYPE_TMP_BUFFER);
136139

137-
if (g->sce_wrapped_key_aes128 != NULL)
138-
XFREE(g->sce_wrapped_key_aes128,
140+
if (g->wrapped_key_aes128 != NULL)
141+
XFREE(g->wrapped_key_aes128,
139142
NULL, DYNAMIC_TYPE_TMP_BUFFER);
140143

141144
#if defined(WOLFSSL_RENESAS_SCEPROTECT_CRYPTONLY)
142-
if (g->sce_wrapped_key_rsapri2048 != NULL)
143-
XFREE(g->sce_wrapped_key_rsapri2048,
145+
if (g->wrapped_key_rsapri2048 != NULL)
146+
XFREE(g->wrapped_key_rsapri2048,
144147
NULL, DYNAMIC_TYPE_TMP_BUFFER);
145148

146-
if (g->sce_wrapped_key_rsapub2048 != NULL)
147-
XFREE(g->sce_wrapped_key_rsapub2048,
149+
if (g->wrapped_key_rsapub2048 != NULL)
150+
XFREE(g->wrapped_key_rsapub2048,
148151
NULL, DYNAMIC_TYPE_TMP_BUFFER);
149152

150-
if (g->sce_wrapped_key_rsapri1024 != NULL)
151-
XFREE(g->sce_wrapped_key_rsapri1024,
153+
if (g->wrapped_key_rsapri1024 != NULL)
154+
XFREE(g->wrapped_key_rsapri1024,
152155
NULL, DYNAMIC_TYPE_TMP_BUFFER);
153156

154-
if (g->sce_wrapped_key_rsapub2048 != NULL)
155-
XFREE(g->sce_wrapped_key_rsapub1024,
157+
if (g->wrapped_key_rsapub2048 != NULL)
158+
XFREE(g->wrapped_key_rsapub1024,
156159
NULL, DYNAMIC_TYPE_TMP_BUFFER);
157160
#endif
158161
XMEMSET(g, 0, sizeof(User_SCEPKCbInfo));
159162
}
163+
#endif
160164

161165
void sce_test(void)
162166
{
@@ -236,15 +240,15 @@ void sce_test(void)
236240
sce_aes_wrapped_key_t *p1 = NULL;
237241
sce_aes_wrapped_key_t *p2 = NULL;
238242

239-
guser_PKCbInfo.sce_wrapped_key_aes256 =
243+
guser_PKCbInfo.wrapped_key_aes256 =
240244
(sce_aes_wrapped_key_t*)XMALLOC(sizeof(sce_aes_wrapped_key_t),
241245
NULL, DYNAMIC_TYPE_TMP_BUFFER);
242-
p1 = (sce_aes_wrapped_key_t*)guser_PKCbInfo.sce_wrapped_key_aes256;
246+
p1 = (sce_aes_wrapped_key_t*)guser_PKCbInfo.wrapped_key_aes256;
243247

244-
guser_PKCbInfo.sce_wrapped_key_aes128 =
248+
guser_PKCbInfo.wrapped_key_aes128 =
245249
(sce_aes_wrapped_key_t*)XMALLOC(sizeof(sce_aes_wrapped_key_t),
246250
NULL, DYNAMIC_TYPE_TMP_BUFFER);
247-
p2 = (sce_aes_wrapped_key_t*)guser_PKCbInfo.sce_wrapped_key_aes128;
251+
p2 = (sce_aes_wrapped_key_t*)guser_PKCbInfo.wrapped_key_aes128;
248252

249253
if ( p1 == NULL || p2 == NULL) {
250254
printf("failed to alloc memory!");
@@ -276,6 +280,16 @@ void sce_test(void)
276280
#include "hal_data.h"
277281
#include "r_sce.h"
278282

283+
#if defined(WOLFSSL_TLS13)
284+
/* TLS1.3 needs RSA_PSS enabled.
285+
* SCE doesn't support RSA PSS Padding
286+
*/
287+
const char* cipherlist[] = {
288+
NULL
289+
};
290+
const int cipherlist_sz = 1;
291+
TestInfo info[cipherlist_sz];
292+
#else
279293
#if defined(USE_CERT_BUFFERS_256)
280294
#if !defined(TLS_MULTITHREAD_TEST)
281295
const char* cipherlist[] = {
@@ -317,6 +331,7 @@ void sce_test(void)
317331
TestInfo info[cipherlist_sz];
318332
#endif
319333
#endif
334+
#endif
320335

321336
#ifdef TLS_MULTITHREAD_TEST
322337
BaseType_t xReturned;
@@ -381,22 +396,26 @@ void sce_test(void)
381396

382397
#else
383398

399+
int TCP_connect_retry = 0;
384400
wolfSSL_TLS_client_init();
385401

386402
do {
387403

388-
info[i].port = DEFAULT_PORT;
389-
info[i].cipher = cipherlist[i];
390-
info[i].ctx = client_ctx;
391-
info[i].id = i;
392-
393-
memset(info[i].name, 0, sizeof(info[i].name));
394-
sprintf(info[i].name, "wolfSSL_TLS_client_do(%02d)", i);
404+
info[i].port = DEFAULT_PORT;
405+
info[i].cipher = cipherlist[i];
406+
info[i].ctx = client_ctx;
407+
info[i].id = i;
395408

396-
wolfSSL_TLS_client_do(&info[i]);
409+
XMEMSET(info[i].name, 0, sizeof(info[i].name));
410+
XSPRINTF(info[i].name, "wolfSSL_TLS_client_do(%02d)", i);
397411

412+
if(wolfSSL_TLS_client_do(&info[i]) == -116) {
413+
TCP_connect_retry++;
414+
continue;
415+
}
416+
TCP_connect_retry = 0;
398417
i++;
399-
} while (i < cipherlist_sz);
418+
} while (i < cipherlist_sz && TCP_connect_retry < 5);
400419

401420
#endif /* SCE_MULTITHREAD_TEST */
402421

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

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,14 @@ static const byte ucDNSServerAddress[4] = { 192, 168, 11, 1 };
4141

4242
#ifdef TLS_MULTITHREAD_TEST
4343
xSemaphoreHandle exit_semaph;
44-
extern User_SCEPKCbInfo guser_PKCbInfo_taskA;
45-
extern User_SCEPKCbInfo guser_PKCbInfo_taskB;
44+
# ifdef WOLFSSL_RENESAS_SCEPROTECT
45+
extern FSPSM_ST guser_PKCbInfo_taskA;
46+
extern FSPSM_ST guser_PKCbInfo_taskB;
47+
# endif
4648
#else
47-
extern User_SCEPKCbInfo guser_PKCbInfo;
49+
# ifdef WOLFSSL_RENESAS_SCEPROTECT
50+
extern FSPSM_ST guser_PKCbInfo;
51+
# endif
4852
#endif
4953

5054
int SEGGER_RTT_vprintf(unsigned BufferIndex, const char * sFormat, va_list * pParamList);
@@ -125,7 +129,7 @@ void wolfSSL_TLS_client_init()
125129
#endif
126130
}
127131

128-
void wolfSSL_TLS_client_do(void *pvParam)
132+
int wolfSSL_TLS_client_do(void *pvParam)
129133
{
130134

131135
int ret;
@@ -192,17 +196,17 @@ void wolfSSL_TLS_client_do(void *pvParam)
192196
/* Set callback CTX */
193197
#if !defined(TLS_MULTITHREAD_TEST)
194198

195-
memset(&guser_PKCbInfo, 0, sizeof(User_SCEPKCbInfo));
199+
XMEMSET(&guser_PKCbInfo, 0, sizeof(FSPSM_ST));
196200
guser_PKCbInfo.devId = 0;
197201
wc_sce_set_callback_ctx(ssl, (void*)&guser_PKCbInfo);
198202

199203
#else
200204
if (p->port - DEFAULT_PORT == 0) {
201-
memset(&guser_PKCbInfo_taskA, 0, sizeof(User_SCEPKCbInfo));
205+
XMEMSET(&guser_PKCbInfo_taskA, 0, sizeof(FSPSM_ST));
202206
wc_sce_set_callback_ctx(ssl, (void*)&guser_PKCbInfo_taskA);
203207
}
204208
else {
205-
memset(&guser_PKCbInfo_taskB, 0, sizeof(User_SCEPKCbInfo));
209+
XMEMSET(&guser_PKCbInfo_taskB, 0, sizeof(FSPSM_ST));
206210
wc_sce_set_callback_ctx(ssl, (void*)&guser_PKCbInfo_taskB);
207211
}
208212
#endif
@@ -257,7 +261,9 @@ void wolfSSL_TLS_client_do(void *pvParam)
257261
wolfSSL_free(ssl);
258262
ssl = NULL;
259263
/* need to reset callback */
264+
#ifdef WOLFSSL_RENESAS_SCEPROTECT
260265
wc_sce_set_callbacks(client_ctx);
266+
#endif
261267
}
262268
/* clean up socket */
263269
if (xClientSocket) {
@@ -270,7 +276,7 @@ void wolfSSL_TLS_client_do(void *pvParam)
270276
xSemaphoreGive(exit_semaph);
271277
vTaskDelete(NULL);
272278
#endif
273-
279+
return ret;
274280
}
275281

276282
void wolfSSL_TLS_cleanup()

0 commit comments

Comments
 (0)