From 2fbe030e5eae127d954664acec1795cb3a8d37bf Mon Sep 17 00:00:00 2001 From: Hideki Miyazaki Date: Sat, 9 Apr 2022 14:09:07 +0900 Subject: [PATCH] update tsip version to 1.15 --- .../e2studio/RX65N/GR-ROSE/README_EN.md | 8 +- .../e2studio/RX65N/GR-ROSE/README_JP.md | 8 +- .../RX65N/GR-ROSE/common/user_settings.h | 3 +- .../e2studio/RX65N/GR-ROSE/smc/smc.scfg | 12 +-- .../RX65N/GR-ROSE/test/src/key_data.c | 44 +++++------ .../RX65N/GR-ROSE/test/src/test_main.c | 77 ++++++++++--------- .../RX65N/GR-ROSE/test/src/wolf_client.c | 30 +++++--- .../RX65N/GR-ROSE/test/src/wolf_server.c | 23 ++++-- 8 files changed, 112 insertions(+), 93 deletions(-) diff --git a/IDE/Renesas/e2studio/RX65N/GR-ROSE/README_EN.md b/IDE/Renesas/e2studio/RX65N/GR-ROSE/README_EN.md index f3ba54c3f..e0694024b 100644 --- a/IDE/Renesas/e2studio/RX65N/GR-ROSE/README_EN.md +++ b/IDE/Renesas/e2studio/RX65N/GR-ROSE/README_EN.md @@ -29,10 +29,10 @@ This sample program uses the following hardware and software libraries. If a new |:--|:--| |Board|GR-ROSE| |Device|R5F565NEHxFP| -|IDE| Renesas e2Studio Version:2021-10 | +|IDE| Renesas e2Studio Version:2022-01 | |Emulator| E1, E2 Emulator Lite | |Toolchain|CCRX v3.03.00| -|TSIP| TSIP v1.14| +|TSIP| TSIP v1.15|
The project of this sample program has a configuration file that uses the following FIT components. @@ -47,10 +47,10 @@ However, the FIT components themselves are not included in the distribution of t |Generic system timer for RX MCUs|1.01|r_sys_time_rx| |TCP/IP protocol stack[M3S-T4-Tiny] - RX Ethernet Driver Interface|1.09|r_t4_driver_rx| |TCP/IP protocol stack[M3S-T4-Tiny] for Renesas MCUs|2.10|r_t4_rx| -|TSIP(Trusted Secure IP) driver|1.14|r_tsip_rx| +|TSIP(Trusted Secure IP) driver|1.15.l|r_tsip_rx|
-Note) As of December 2021, TIPS v1.14 does not seem to be able to be added as a FIT component by adding a component in the Smart Configurator Perspective. Add it manually along the method described later. +Note) As of April 2022, TIPS v1.15 does not seem to be able to be added as a FIT component by adding a component in the Smart Configurator Perspective. Add it manually along the method described later.

## 3. Importing sample application project into e2Studio diff --git a/IDE/Renesas/e2studio/RX65N/GR-ROSE/README_JP.md b/IDE/Renesas/e2studio/RX65N/GR-ROSE/README_JP.md index ef4b0b980..80292ccbc 100644 --- a/IDE/Renesas/e2studio/RX65N/GR-ROSE/README_JP.md +++ b/IDE/Renesas/e2studio/RX65N/GR-ROSE/README_JP.md @@ -30,10 +30,10 @@ Renesas社製MCU RX65Nを搭載した評価ボードGR-ROSEをターゲットと |:--|:--| |評価ボード|GR-ROSE| |Device|R5F565NEHxFP| -|IDE| Renesas e2Studio Version:2021-10 | +|IDE| Renesas e2Studio Version:2022-01 | |エミュレーター| E1, E2エミュレーターLite | |Toolchain|CCRX v3.03.00| -|TSIP| TSIP v1.14| +|TSIP| TSIP v1.15|
本サンプルプログラムのプロジェクトには以下のFITコンポーネントを使用する設定ファイルが用意されています。 @@ -50,9 +50,9 @@ Renesas社製MCU RX65Nを搭載した評価ボードGR-ROSEをターゲットと |Generic system timer for RX MCUs|1.01|r_sys_time_rx| |TCP/IP protocol stack[M3S-T4-Tiny] - RX Ethernet Driver Interface|1.09|r_t4_driver_rx| |TCP/IP protocol stack[M3S-T4-Tiny] for Renesas MCUs|2.10|r_t4_rx| -|TSIP(Trusted Secure IP) driver|1.14|r_tsip_rx| +|TSIP(Trusted Secure IP) driver|1.15.l|r_tsip_rx| -（注意）2021年12月現在、TIPSv1.14はFITコンポーネントとしてスマートコンフィギュレータパースペクティブのコンポーネントの追加操作では追加できないようです。後ほど説明する手動での追加方法を使って追加してください。
+（注意）2022年4月現在、TIPSv1.15はFITコンポーネントとしてスマートコンフィギュレータパースペクティブのコンポーネントの追加操作では追加できないようです。後ほど説明する手動での追加方法を使って追加してください。


diff --git a/IDE/Renesas/e2studio/RX65N/GR-ROSE/common/user_settings.h b/IDE/Renesas/e2studio/RX65N/GR-ROSE/common/user_settings.h index 509040ec2..36b6a9a94 100644 --- a/IDE/Renesas/e2studio/RX65N/GR-ROSE/common/user_settings.h +++ b/IDE/Renesas/e2studio/RX65N/GR-ROSE/common/user_settings.h @@ -37,9 +37,10 @@ * 109: TSIPv1.09 * 113: TSIPv1.13 * 114: TSIPv1.14 + * 115: TSIPv1.15 *----------------------------------------------------------------------------*/ #define WOLFSSL_RENESAS_TSIP - #define WOLFSSL_RENESAS_TSIP_VER 114 + #define WOLFSSL_RENESAS_TSIP_VER 115 /*-- TLS version definitions -------------------------------------------------- diff --git a/IDE/Renesas/e2studio/RX65N/GR-ROSE/smc/smc.scfg b/IDE/Renesas/e2studio/RX65N/GR-ROSE/smc/smc.scfg index d5ffc0b07..d0df28d6d 100644 --- a/IDE/Renesas/e2studio/RX65N/GR-ROSE/smc/smc.scfg +++ b/IDE/Renesas/e2studio/RX65N/GR-ROSE/smc/smc.scfg @@ -4,6 +4,7 @@ + @@ -608,6 +609,7 @@ + @@ -822,11 +824,6 @@ - - - - - @@ -963,6 +960,11 @@ + + + + +
diff --git a/IDE/Renesas/e2studio/RX65N/GR-ROSE/test/src/key_data.c b/IDE/Renesas/e2studio/RX65N/GR-ROSE/test/src/key_data.c index 9ab3a96e1..e4c2632d4 100644 --- a/IDE/Renesas/e2studio/RX65N/GR-ROSE/test/src/key_data.c +++ b/IDE/Renesas/e2studio/RX65N/GR-ROSE/test/src/key_data.c @@ -145,28 +145,28 @@ const int sizeof_ca_cert_sig = sizeof(ca_cert_der_sig); /* ./client-cert.der.sign, */ const unsigned char client_cert_der_sign[] = { - 0x5D, 0x1F, 0x89, 0x41, 0xEC, 0x47, 0xC8, 0x90, 0x61, 0x79, 0x8A, 0x16, - 0x1F, 0x31, 0x96, 0x67, 0xD9, 0x3C, 0xEC, 0x6B, 0x58, 0xC6, 0x5A, 0xED, - 0x99, 0xB3, 0xEF, 0x27, 0x6F, 0x04, 0x8C, 0xD9, 0x68, 0xB1, 0xD6, 0x23, - 0x15, 0x84, 0x00, 0xE1, 0x27, 0xD1, 0x1F, 0x68, 0xB7, 0x3F, 0x13, 0x53, - 0x8A, 0x95, 0x5A, 0x20, 0x7C, 0xB2, 0x76, 0x5B, 0xDC, 0xE0, 0xA6, 0x21, - 0x7C, 0x49, 0xCF, 0x93, 0xBA, 0xD5, 0x12, 0x9F, 0xEE, 0x90, 0x5B, 0x3F, - 0xA3, 0x9D, 0x13, 0x72, 0xAC, 0x72, 0x16, 0xFE, 0x1D, 0xBE, 0xEB, 0x8E, - 0xC7, 0xDC, 0xC4, 0xF8, 0x1A, 0xD8, 0xA0, 0xA4, 0xF6, 0x04, 0x30, 0xF6, - 0x7E, 0xB6, 0xC8, 0xE1, 0xAB, 0x88, 0x37, 0x08, 0x63, 0x72, 0xAA, 0x46, - 0xCC, 0xCA, 0xF0, 0x9E, 0x02, 0x1E, 0x65, 0x67, 0xFF, 0x2C, 0x9D, 0x81, - 0x6C, 0x1E, 0xF1, 0x54, 0x05, 0x68, 0x68, 0x18, 0x72, 0x26, 0x55, 0xB6, - 0x2C, 0x95, 0xC0, 0xC9, 0xB2, 0xA7, 0x0B, 0x60, 0xD7, 0xEB, 0x1D, 0x08, - 0x1A, 0xA2, 0x54, 0x15, 0x89, 0xCB, 0x83, 0x21, 0x5D, 0x15, 0x9B, 0x38, - 0xAC, 0x89, 0x63, 0xD5, 0x4B, 0xF4, 0x8B, 0x47, 0x93, 0x78, 0x43, 0xCB, - 0x9B, 0x71, 0xBF, 0x94, 0x76, 0xB5, 0xCE, 0x35, 0xA9, 0x1A, 0xD5, 0xA5, - 0xD8, 0x19, 0xA6, 0x04, 0x39, 0xB1, 0x09, 0x8C, 0x65, 0x02, 0x58, 0x3A, - 0x95, 0xEF, 0xA2, 0xC3, 0x85, 0x18, 0x61, 0x23, 0x2D, 0xC5, 0xCD, 0x62, - 0xC1, 0x19, 0x31, 0xE5, 0x36, 0x95, 0x22, 0xDB, 0x3E, 0x1A, 0x3C, 0xE8, - 0xC6, 0x2E, 0xDF, 0xD9, 0x2F, 0x84, 0xC1, 0xF0, 0x38, 0x2B, 0xE5, 0x73, - 0x35, 0x4F, 0x05, 0xE2, 0xA5, 0x60, 0x79, 0xB0, 0x23, 0xDC, 0x56, 0x4C, - 0xE7, 0xD9, 0x1F, 0xCF, 0x6A, 0xFC, 0x55, 0xEB, 0xAA, 0x48, 0x3E, 0x95, - 0x2A, 0x10, 0x01, 0x05 + 0x9a, 0x0e, 0xbc, 0x0f, 0x7a, 0xbe, 0xb6, 0x47, 0x79, 0x71, 0xcc, 0x51, + 0x87, 0xaa, 0x28, 0xbd, 0x9c, 0x04, 0x08, 0x0b, 0xb9, 0x78, 0x84, 0xeb, + 0x1d, 0xf9, 0x0e, 0x38, 0x23, 0xfe, 0x8f, 0x6e, 0x75, 0x21, 0xcc, 0x39, + 0x79, 0xf8, 0x9d, 0x80, 0x6b, 0xa9, 0x63, 0x79, 0x13, 0xd8, 0xc9, 0x5d, + 0xd5, 0x84, 0x17, 0xdc, 0xe4, 0x56, 0xae, 0x55, 0x64, 0x69, 0x8c, 0x95, + 0xa4, 0x03, 0xc1, 0x4a, 0xe8, 0xb6, 0xd5, 0x1b, 0xfa, 0x26, 0x3f, 0x2c, + 0xff, 0xfc, 0xea, 0x83, 0xca, 0xf7, 0x4d, 0x9e, 0xf4, 0xbf, 0xca, 0xb6, + 0x19, 0x46, 0x55, 0x45, 0xf4, 0x7d, 0xcd, 0x4b, 0xbc, 0x3d, 0xb7, 0xff, + 0x57, 0xbf, 0xe8, 0x0e, 0xbc, 0x16, 0x45, 0xa1, 0xdb, 0xf0, 0xb4, 0x44, + 0x64, 0x76, 0x0b, 0xe5, 0x86, 0x32, 0xbe, 0xd7, 0xf0, 0x26, 0x6c, 0x48, + 0xb6, 0x7f, 0x1a, 0x2a, 0xe6, 0x1b, 0xbd, 0x5b, 0x9e, 0xca, 0xd0, 0xf4, + 0xbb, 0xe4, 0x7f, 0x29, 0x66, 0xf6, 0x31, 0x6d, 0x70, 0x6f, 0xfd, 0x4d, + 0x7f, 0xc8, 0x7f, 0x9a, 0x5b, 0x1e, 0x37, 0xf7, 0x0c, 0x66, 0xb2, 0x62, + 0xd8, 0x3e, 0xca, 0x79, 0x6c, 0xec, 0x05, 0x01, 0xda, 0xd9, 0xe2, 0xc3, + 0xd5, 0x9b, 0xf9, 0x43, 0xa6, 0x14, 0x9a, 0x1f, 0x32, 0xd3, 0x68, 0x63, + 0x65, 0xb8, 0xb1, 0x63, 0xd5, 0xe2, 0xaa, 0x06, 0x27, 0x62, 0x4a, 0x95, + 0x48, 0x3f, 0xee, 0xde, 0x3b, 0x89, 0xd4, 0x61, 0x74, 0x39, 0xef, 0xe6, + 0x6e, 0x16, 0x2d, 0x8b, 0x54, 0x29, 0xe9, 0x71, 0xbc, 0xd4, 0x30, 0x42, + 0x35, 0x1e, 0x89, 0xfb, 0xf7, 0x4a, 0x47, 0x87, 0x41, 0x66, 0x49, 0xe5, + 0x8e, 0x16, 0x7f, 0x17, 0x07, 0xd6, 0xff, 0xe1, 0x2a, 0x4d, 0x7c, 0x70, + 0x0d, 0x72, 0x5d, 0x3d, 0x1f, 0xd8, 0x41, 0x1a, 0x43, 0x00, 0x31, 0x81, + 0x60, 0xa8, 0x6c, 0xef }; const int sizeof_client_cert_der_sign = sizeof(client_cert_der_sign); diff --git a/IDE/Renesas/e2studio/RX65N/GR-ROSE/test/src/test_main.c b/IDE/Renesas/e2studio/RX65N/GR-ROSE/test/src/test_main.c index dd1a1b614..c1b3523c4 100644 --- a/IDE/Renesas/e2studio/RX65N/GR-ROSE/test/src/test_main.c +++ b/IDE/Renesas/e2studio/RX65N/GR-ROSE/test/src/test_main.c @@ -181,40 +181,13 @@ void Close_tcp() void main(void) { - (void)timeTick; - -#if defined(CRYPT_TEST) || defined(BENCHMARK) -#if defined(CRYPT_TEST) + int i = 0; int ret; - func_args args = { 0 }; - - if ((ret = wolfCrypt_Init()) != 0) { - printf("wolfCrypt_Init failed %d\n", ret); - } - - printf("Start wolfCrypt Test\n"); - wolfcrypt_test(args); - printf("End wolfCrypt Test\n"); - - if ((ret = wolfCrypt_Cleanup()) != 0) { - printf("wolfCrypt_Cleanup failed %d\n", ret); - } -#endif -#if defined(BENCHMARK) - #include "r_cmt_rx_if.h" - + int doClientCheck = 0; uint32_t channel; - R_CMT_CreatePeriodic(FREQ, &timeTick, &channel); - - printf("Start wolfCrypt Benchmark\n"); - benchmark_test(NULL); - printf("End wolfCrypt Benchmark\n"); -#endif -#elif defined(TLS_CLIENT) - #include "r_cmt_rx_if.h" - -#if defined(WOLFSSL_RENESAS_TSIP_TLS) +#if defined(WOLFSSL_RENESAS_TSIP_TLS) && \ + defined(TLS_CLIENT) #ifdef USE_ECC_CERT const char* cipherlist[] = { "ECDHE-ECDSA-AES128-GCM-SHA256", @@ -234,13 +207,41 @@ void main(void) const int cipherlist_sz = 6; #endif - -#else - const char* cipherlist[] = { NULL }; - const int cipherlist_sz = 0; - #endif - int i = 0; + + (void)timeTick; + (void)i; + (void)ret; + (void)channel; + (void)doClientCheck; + +#if defined(CRYPT_TEST) || defined(BENCHMARK) +#if defined(CRYPT_TEST) + func_args args = { 0 }; + + if ((ret = wolfCrypt_Init()) != 0) { + printf("wolfCrypt_Init failed %d\n", ret); + } + + printf("Start wolfCrypt Test\n"); + wolfcrypt_test(args); + printf("End wolfCrypt Test\n"); + + if ((ret = wolfCrypt_Cleanup()) != 0) { + printf("wolfCrypt_Cleanup failed %d\n", ret); + } +#endif +#if defined(BENCHMARK) + #include "r_cmt_rx_if.h" + + R_CMT_CreatePeriodic(FREQ, &timeTick, &channel); + + printf("Start wolfCrypt Benchmark\n"); + benchmark_test(NULL); + printf("End wolfCrypt Benchmark\n"); +#endif +#elif defined(TLS_CLIENT) + #include "r_cmt_rx_if.h" Open_tcp(); @@ -266,7 +267,7 @@ void main(void) SetTsiptlsKey(); #endif - wolfSSL_TLS_server_init(); + wolfSSL_TLS_server_init(doClientCheck); wolfSSL_TLS_server(); Close_tcp(); diff --git a/IDE/Renesas/e2studio/RX65N/GR-ROSE/test/src/wolf_client.c b/IDE/Renesas/e2studio/RX65N/GR-ROSE/test/src/wolf_client.c index 942e37dbe..c1fe033c2 100644 --- a/IDE/Renesas/e2studio/RX65N/GR-ROSE/test/src/wolf_client.c +++ b/IDE/Renesas/e2studio/RX65N/GR-ROSE/test/src/wolf_client.c @@ -29,7 +29,7 @@ #include "wolfssl_demo.h" -#define SIMPLE_TLSSEVER_IP "192.168.1.14" +#define SIMPLE_TLSSEVER_IP "192.168.11.32" #define SIMPLE_TLSSERVER_PORT "11111" ER t4_tcp_callback(ID cepid, FN fncd , VP p_parblk); @@ -155,7 +155,7 @@ void wolfSSL_TLS_client( ) ER ercd; int ret; WOLFSSL_CTX *ctx = (WOLFSSL_CTX *)client_ctx; - WOLFSSL *ssl; + WOLFSSL *ssl = NULL; #define BUFF_SIZE 256 static const char sendBuff[]= "Hello Server\n" ; @@ -168,21 +168,21 @@ void wolfSSL_TLS_client( ) if((dst_addr.ipaddr = getIPaddr(SIMPLE_TLSSEVER_IP)) == 0){ printf("ERROR: IP address\n"); - return; + goto out; } if((dst_addr.portno = getPort(SIMPLE_TLSSERVER_PORT)) == 0){ printf("ERROR: IP address\n"); - return; + goto out; } if((ercd = tcp_con_cep(cepid, &my_addr, &dst_addr, TMO_FEVR)) != E_OK) { printf("ERROR TCP Connect: %d\n", ercd); - return; + goto out; } if((ssl = wolfSSL_new(ctx)) == NULL) { printf("ERROR wolfSSL_new: %d\n", wolfSSL_get_error(ssl, 0)); - return; + goto out; } #ifdef WOLFSSL_RENESAS_TSIP_TLS @@ -196,25 +196,33 @@ void wolfSSL_TLS_client( ) if(wolfSSL_connect(ssl) != SSL_SUCCESS) { printf("ERROR SSL connect: %d\n", wolfSSL_get_error(ssl, 0)); - return; + goto out; } if (wolfSSL_write(ssl, sendBuff, strlen(sendBuff)) != strlen(sendBuff)) { printf("ERROR SSL write: %d\n", wolfSSL_get_error(ssl, 0)); - return; + goto out; } if ((ret=wolfSSL_read(ssl, rcvBuff, BUFF_SIZE)) < 0) { printf("ERROR SSL read: %d\n", wolfSSL_get_error(ssl, 0)); - return; + goto out; } rcvBuff[ret] = '\0' ; printf("Received: %s\n\n", rcvBuff); + out: + /* frees all data before client termination */ - wolfSSL_free(ssl); - wolfSSL_CTX_free(ctx); + if(ssl) { + wolfSSL_shutdown(ssl); + wolfSSL_free(ssl); + } + if(ctx) { + wolfSSL_CTX_free(ctx); + } + wolfSSL_Cleanup(); tcp_sht_cep(cepid); diff --git a/IDE/Renesas/e2studio/RX65N/GR-ROSE/test/src/wolf_server.c b/IDE/Renesas/e2studio/RX65N/GR-ROSE/test/src/wolf_server.c index 0f3d301f5..db1fb918b 100644 --- a/IDE/Renesas/e2studio/RX65N/GR-ROSE/test/src/wolf_server.c +++ b/IDE/Renesas/e2studio/RX65N/GR-ROSE/test/src/wolf_server.c @@ -163,7 +163,7 @@ void wolfSSL_TLS_server( ) ER ercd; WOLFSSL_CTX *ctx = (WOLFSSL_CTX *)server_ctx; - WOLFSSL *ssl; + WOLFSSL *ssl = NULL; int len; #define BUFF_SIZE 256 char buff[BUFF_SIZE]; @@ -171,12 +171,12 @@ void wolfSSL_TLS_server( ) if((ercd = tcp_acp_cep(cepid, repid, &dst_addr, TMO_FEVR)) != E_OK) { printf("ERROR TCP Accept: %d\n", ercd); - return; + goto out; } if((ssl = wolfSSL_new(ctx)) == NULL) { printf("ERROR: failed wolfSSL_new\n"); - return; + goto out; } wolfSSL_SetIOReadCtx(ssl, (void *)&cepid); @@ -184,12 +184,12 @@ void wolfSSL_TLS_server( ) if (wolfSSL_accept(ssl) < 0) { printf("ERROR: SSL Accept(%d)\n", wolfSSL_get_error(ssl, 0)); - return; + goto out; } if ((len = wolfSSL_read(ssl, buff, sizeof(buff) - 1)) < 0) { printf("ERROR: SSL Read(%d)\n", wolfSSL_get_error(ssl, 0)); - return; + goto out; } buff[len] = '\0'; @@ -197,11 +197,18 @@ void wolfSSL_TLS_server( ) if (wolfSSL_write(ssl, buff, len) != len) { printf("ERROR: SSL Write(%d)\n", wolfSSL_get_error(ssl, 0)); - return; } - wolfSSL_free(ssl); - wolfSSL_CTX_free(ctx); +out: + if (ssl) { + wolfSSL_shutdown(ssl); + wolfSSL_free(ssl); + } + if (ctx) { + wolfSSL_CTX_free(ctx); + }; + wolfSSL_Cleanup(); tcp_sht_cep(cepid); + tcp_cls_cep(cepid, TMO_FEVR); }