updated as the latest version of sw use

2019-04-16 19:27:29 +09:00
parent 013e4429da
commit 1ab5a022c6
6 changed files with 87 additions and 31 deletions
--- a/IDE/Renesas/cs+/Projects/common/user_settings.h
+++ b/IDE/Renesas/cs+/Projects/common/user_settings.h
@@ -50,7 +50,6 @@

 #define USER_TIME
 #define XTIME time
-#define HAVE_TIME_T_TYPE
 #define USE_WOLF_SUSECONDS_T
 #define USE_WOLF_TIMEVAL_T

--- a/IDE/Renesas/cs+/Projects/t4_demo/README_en.txt
+++ b/IDE/Renesas/cs+/Projects/t4_demo/README_en.txt
@@ -1,6 +1,10 @@
 wolfSSL/AlphaProject Boad demo setup Guide

-This demo is tested with Renesas CS+ v6.01<EFBFBD>AAP-RX71M-0A, wolfSSL 3.15.3.
+This demo is tested with the following condition.
+
+  Renesas : CS+ v6.01, v8.01
+  Board   : AP-RX71M-0A
+  wolfSSL : 3.15.3, 4.0.0

 Setup process:
 1. Download software
@@ -12,6 +16,10 @@ Setup process:
  - open t4_demo.mtpj and build. This create demo program library.

 3. Set up AlphaProject
+
+  !!** When you use version 2.0 of a sample program, **!!
+  !!** please replace _ether_ to _usbfunc_           **!!
+
  - The demo uses ap_rx71m_0a_sample_cs\Sample\ap_rx71m_0a_ether_sample_cs\
    ap_rx71m_0a_ether_sample_cs.mtpj
  - Open and edit ap_rx71m_0a_sample_cs\Sample\ap_rx71m_0a_ether_sample_cs\src\AP_RX71M_0A.c
@@ -23,14 +31,33 @@ Setup process:
    echo_srv_init();
    wolfSSL_init(); <- insert this line
 ===
+!!** when you use version 2.0 **!!
+===
+    CanInit();
+    SciInit();
+    EthernetAppInit();
+    UsbfInit();
+    wolfSSL_init(); <- insert this line
+===
+!!******************************!!

  - Modify stack and heap size in ap_rx71m_0a_sample_cs\Sample\ap_rx71m_0a_ether_sample_cs\src\r_config
  Line 120#pragma stacksize su=0x2000
  Line 139 #define BSP_CFG_HEAP_BYTES  (0xa000)

-<EFBFBD>@- Modify IP address ib Sample\ap_rx71m_0a_ether_sample_cs\src\r_t4_rx\src\config_tcpudp.c
-<EFBFBD>@as needed
-<EFBFBD>@
+!!** when you use version 2.0 **!!
+  - Modify stack and heap size in ap_rx71m_0a_sample_cs\Sample\ap_rx71m_0a_usbfunc_sample_cs\src\smc_gen\r_bsp_config.h
+  Line 154#pragma stacksize su=0x2000
+  Line 175#define BSP_CFG_HEAP_BYTES  (0xa000)
+!!******************************!!
+
+  - Modify IP address Sample\ap_rx71m_0a_ether_sample_cs\src\r_t4_rx\src\config_tcpudp.c
+  as needed
+!!** when you use version 2.0 **!!
+  - Modify IP address Sample\ap_rx71m_0a_usbfunc_sample_cs\src\tcp_sample\src\config_tcpudp.c
+  as needed
+!!******************************!!
+
 ===
 #define MY_IP_ADDR0     192,168,1,200           /* Local IP address  */
 #define GATEWAY_ADDR0   192,168,1,254           /* Gateway address (invalid if all 0s) */
@@ -66,16 +93,16 @@ c: simple client. Specify IP address and port as following.
   You can use wolfssl/examples/server and client on your PC for TLS peer test.
   
   
-PC side<EFBFBD>F
+PC side
 $ ./examples/server/server -b -d

-Board side<EFBFBD>F
+Board side
 > c <IP Addr> 11111

-Board side<EFBFBD>F
+Board side
 > s

-PC side<EFBFBD>F
+PC side
 $ ./examples/client/client -h <IP Addr> -p 50000

 ---
--- a/IDE/Renesas/cs+/Projects/t4_demo/README_jp.txt
+++ b/IDE/Renesas/cs+/Projects/t4_demo/README_jp.txt
@@ -1,6 +1,10 @@
 wolfSSL/AlphaProject<63>{<7B>[<5B>h<EFBFBD>f<EFBFBD><66><EFBFBD>@<40>Z<EFBFBD>b<EFBFBD>g<EFBFBD>A<EFBFBD>b<EFBFBD>v<EFBFBD>K<EFBFBD>C<EFBFBD>h

-<EFBFBD><EFBFBD><EFBFBD>̃f<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Renesas CS+ v6.01<EFBFBD>AAP-RX71M-0A, wolfSSL 3.15.3 <EFBFBD>Ńe<EFBFBD>X<EFBFBD>g<EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><EFBFBD>܂<EFBFBD><EFBFBD>B
+<EFBFBD><EFBFBD><EFBFBD>̃f<EFBFBD><EFBFBD><EFBFBD>͈ȉ<EFBFBD><EFBFBD>̊<EFBFBD><EFBFBD>Ńe<EFBFBD>X<EFBFBD>g<EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><EFBFBD>܂<EFBFBD><EFBFBD>B
+
+  Renesas : CS+ v6.01, v8.01
+  Board   : AP-RX71M-0A
+  wolfSSL : 3.15.3, 4.0.0

 <EFBFBD>Z<EFBFBD>b<EFBFBD>g<EFBFBD>A<EFBFBD>b<EFBFBD>v<EFBFBD>菇<EFBFBD>F

@@ -9,12 +13,16 @@ wolfSSL/AlphaProject
 <EFBFBD>@- <20><><EFBFBD><EFBFBD><EFBFBD>t<EFBFBD>H<EFBFBD><48><EFBFBD>_<EFBFBD>[<5B><><EFBFBD><EFBFBD>wolfssl<73>ꎮ<EFBFBD><EA8EAE><EFBFBD>𓀂<EFBFBD><F0938082>܂<EFBFBD><DC82>B

 <EFBFBD>Q<EFBFBD>DwolfSSL<EFBFBD>̃Z<EFBFBD>b<EFBFBD>g<EFBFBD>A<EFBFBD>b<EFBFBD>v
-<EFBFBD>@- CS+<2B>ɂ<EFBFBD>wolfssl\IDE\Renesas\cs+\Project<63><74><EFBFBD><EFBFBD>wolfssl\lib.mtpj<70><6A><EFBFBD>J<EFBFBD><4A>
+<EFBFBD>@- CS+<2B>ɂ<EFBFBD>wolfssl\IDE\Renesas\cs+\Project<63><74><EFBFBD><EFBFBD>wolfssl\wolfssl_lib.mtpj<70><6A><EFBFBD>J<EFBFBD><4A>
 <EFBFBD>@<40>@wolfSSL<53><4C><EFBFBD>C<EFBFBD>u<EFBFBD><75><EFBFBD><EFBFBD><EFBFBD>[<5B>̃r<CC83><72><EFBFBD>h<EFBFBD><68><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82>B
 <EFBFBD>@- <20><><EFBFBD><EFBFBD><EFBFBD>t<EFBFBD>H<EFBFBD><48><EFBFBD>_<EFBFBD>̉<EFBFBD><CC89><EFBFBD>t4_demo.mtpj<70><6A><EFBFBD>J<EFBFBD><4A><EFBFBD>A<EFBFBD>f<EFBFBD><66><EFBFBD>v<EFBFBD><76><EFBFBD>O<EFBFBD><4F><EFBFBD><EFBFBD><EFBFBD>̃r<CC83><72><EFBFBD>h<EFBFBD><68><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82>B
 <EFBFBD>@<40><><EFBFBD>̃v<CC83><76><EFBFBD>O<EFBFBD><4F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>C<EFBFBD>u<EFBFBD><75><EFBFBD><EFBFBD><EFBFBD>[<5B>`<60><><EFBFBD>Ńr<C583><72><EFBFBD>h<EFBFBD><68><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82>B
-<EFBFBD>@
+
 <EFBFBD>R<EFBFBD>DAlphaProject<EFBFBD><EFBFBD><EFBFBD>̃Z<EFBFBD>b<EFBFBD>g<EFBFBD>A<EFBFBD>b<EFBFBD>v
+  
+  !!** <20>T<EFBFBD><54><EFBFBD>v<EFBFBD><76><EFBFBD>v<EFBFBD><76><EFBFBD>O<EFBFBD><4F><EFBFBD><EFBFBD> v2.0 <20><><EFBFBD>g<EFBFBD>p<EFBFBD><70><EFBFBD><EFBFBD><EFBFBD>ꍇ<EFBFBD>́A_ether_ => _usbfunc_ **!!
+  !!** <20>ƒu<C692><75><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><C482><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>                                           **!!
+
 <EFBFBD>@<40>f<EFBFBD><66><EFBFBD><EFBFBD>ap_rx71m_0a_sample_cs\Sample\ap_rx71m_0a_ether_sample_cs<63>t<EFBFBD>H<EFBFBD><48><EFBFBD>_<EFBFBD><5F><EFBFBD><EFBFBD>
 <EFBFBD>@ap_rx71m_0a_ether_sample_cs.mtpj<70>v<EFBFBD><76><EFBFBD>W<EFBFBD>F<EFBFBD>N<EFBFBD>g<EFBFBD>𗘗p<F0979897><70><EFBFBD>܂<EFBFBD><DC82>B
 <EFBFBD>@
@@ -29,25 +37,47 @@ wolfSSL/AlphaProject
        wolfSSL_init(); <- <20><><EFBFBD>̍s<CC8D><73><EFBFBD>}<7D><>
 ===

-<EFBFBD>@- ap_rx71m_0a_sample_cs\Sample\ap_rx71m_0a_ether_sample_cs\src\r_config<69>t<EFBFBD>@<40>C<EFBFBD><43>
+!!** <20>T<EFBFBD><54><EFBFBD>v<EFBFBD><76><EFBFBD>v<EFBFBD><76><EFBFBD>O<EFBFBD><4F><EFBFBD><EFBFBD> v2.0 <20><><EFBFBD>g<EFBFBD>p<EFBFBD><70><EFBFBD><EFBFBD><EFBFBD>ꍇ<EFBFBD>́A<CD81><41><EFBFBD>L                   **!!
+===
+        CanInit();
+        SciInit();
+        EthernetAppInit();
+        UsbfInit();
+        wolfSSL_init(); <- <20><><EFBFBD>̍s<CC8D><73><EFBFBD>}<7D><>
+===
+!!**********************************************************************!!
+
+<EFBFBD>@- ap_rx71m_0a_sample_cs\Sample\ap_rx71m_0a_ether_sample_cs\src\smc_gen\r_bsp_config.h
 <EFBFBD>@<40><><EFBFBD>J<EFBFBD><4A><EFBFBD>A<EFBFBD>X<EFBFBD>^<5E>b<EFBFBD>N<EFBFBD>T<EFBFBD>C<EFBFBD>Y<EFBFBD>ƃq<C683>[<5B>v<EFBFBD>T<EFBFBD>C<EFBFBD>Y<EFBFBD><59><EFBFBD>ȉ<EFBFBD><C889>̂悤<CC82>ɐݒ肵<DD92>܂<EFBFBD><DC82>B
 <EFBFBD>@
 <EFBFBD>@120<32>s<EFBFBD><73> #pragma stacksize su=0x2000
 <EFBFBD>@139<33>s<EFBFBD><73> #define BSP_CFG_HEAP_BYTES  (0xa000)

+!!** <20>T<EFBFBD><54><EFBFBD>v<EFBFBD><76><EFBFBD>v<EFBFBD><76><EFBFBD>O<EFBFBD><4F><EFBFBD><EFBFBD> v2.0 <20><><EFBFBD>g<EFBFBD>p<EFBFBD><70><EFBFBD><EFBFBD><EFBFBD>ꍇ<EFBFBD>́A<CD81><41><EFBFBD>L                   **!!
+<EFBFBD>@- ap_rx71m_0a_sample_cs\Sample\ap_rx71m_0a_usbfunc_sample_cs\src\smc_gen\r_bsp_config.h
+<EFBFBD>@<40><><EFBFBD>J<EFBFBD><4A><EFBFBD>A<EFBFBD>X<EFBFBD>^<5E>b<EFBFBD>N<EFBFBD>T<EFBFBD>C<EFBFBD>Y<EFBFBD>ƃq<C683>[<5B>v<EFBFBD>T<EFBFBD>C<EFBFBD>Y<EFBFBD><59><EFBFBD>ȉ<EFBFBD><C889>̂悤<CC82>ɐݒ肵<DD92>܂<EFBFBD><DC82>B
+<EFBFBD>@154<35>s<EFBFBD><73> #pragma stacksize su=0x2000
+<EFBFBD>@175<37>s<EFBFBD><73> #define BSP_CFG_HEAP_BYTES  (0xa000)
+!!**********************************************************************!!
+
 <EFBFBD>@- IP<49>A<EFBFBD>h<EFBFBD><68><EFBFBD>X<EFBFBD>̃f<CC83>t<EFBFBD>H<EFBFBD><48><EFBFBD>g<EFBFBD>l<EFBFBD>͈ȉ<CD88><C889>̂悤<CC82>ɂȂ<C982><C882>Ă<EFBFBD><C482>܂<EFBFBD><DC82>B
 <EFBFBD>@<40>K<EFBFBD>v<EFBFBD><76><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>΁ASample\ap_rx71m_0a_ether_sample_cs\src\r_t4_rx\src\config_tcpudp.c
 <EFBFBD>@<40><><EFBFBD><EFBFBD>139<33>s<EFBFBD>ڂ<EFBFBD><DA82><EFBFBD><EFBFBD>̒<EFBFBD><CC92>`<60><><EFBFBD>ύX<CF8D><58><EFBFBD>܂<EFBFBD><DC82>B
-<EFBFBD>@
+<EFBFBD>@!!** <20>T<EFBFBD><54><EFBFBD>v<EFBFBD><76><EFBFBD>v<EFBFBD><76><EFBFBD>O<EFBFBD><4F><EFBFBD><EFBFBD> v2.0 <20><><EFBFBD>g<EFBFBD>p<EFBFBD><70><EFBFBD><EFBFBD><EFBFBD>ꍇ<EFBFBD>́A<CD81><41><EFBFBD>L                   **!!
+  Sample\ap_rx71m_0a_usbfunc_sample_cs\src\tcp_sample\src\config_tcpudp.c
+  <20><><EFBFBD><EFBFBD>166<36>s<EFBFBD>ڂ<EFBFBD><DA82><EFBFBD><EFBFBD>̒<EFBFBD><CC92>`<60><><EFBFBD>ύX<CF8D><58><EFBFBD>܂<EFBFBD><DC82>B
+  !!**********************************************************************!!
+
 ===
 #define MY_IP_ADDR0     192,168,1,200           /* Local IP address  */
 #define GATEWAY_ADDR0   192,168,1,254           /* Gateway address (invalid if all 0s) */
 #define SUBNET_MASK0    255,255,255,0           /* Subnet mask  */
 ===

+
 <EFBFBD>@- CS+<2B><>ap_rx71m_0a_ether_sample_cs.mtpj<70>v<EFBFBD><76><EFBFBD>W<EFBFBD>F<EFBFBD>N<EFBFBD>g<EFBFBD><67><EFBFBD>J<EFBFBD><4A><EFBFBD>AwolfSSL<53>ƃf<C683><66><EFBFBD><EFBFBD><EFBFBD>C<EFBFBD>u<EFBFBD><75><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD>@<40>o<EFBFBD>^<5E><><EFBFBD>܂<EFBFBD><DC82>BCC-RX(<28>r<EFBFBD><72><EFBFBD>h<EFBFBD>c<EFBFBD>[<5B><>)-><3E><><EFBFBD><EFBFBD><EFBFBD>N<EFBFBD>E<EFBFBD>I<EFBFBD>v<EFBFBD>V<EFBFBD><56><EFBFBD><EFBFBD><EFBFBD>^<5E>u-><3E>g<EFBFBD>p<EFBFBD><70><EFBFBD><EFBFBD><EFBFBD>ȉ<EFBFBD><EFBFBD>̓<EFBFBD><EFBFBD>̃t<EFBFBD>@<40>C<EFBFBD><EFBFBD>
-<EFBFBD>@<40><><EFBFBD>o<EFBFBD>^<5E><><EFBFBD>܂<EFBFBD><DC82>B
+<EFBFBD>@<40>o<EFBFBD>^<5E><><EFBFBD>܂<EFBFBD><DC82>BCC-RX(<28>r<EFBFBD><72><EFBFBD>h<EFBFBD>c<EFBFBD>[<5B><>)-><3E><><EFBFBD><EFBFBD><EFBFBD>N<EFBFBD>E<EFBFBD>I<EFBFBD>v<EFBFBD>V<EFBFBD><56><EFBFBD><EFBFBD><EFBFBD>^<5E>u-><3E>g<EFBFBD>p<EFBFBD><70><EFBFBD>郉<EFBFBD>C<EFBFBD>u<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+<EFBFBD>@<40>ȉ<EFBFBD><EFBFBD>̓<EFBFBD><EFBFBD>̃t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD>o<EFBFBD>^<5E><><EFBFBD>܂<EFBFBD><DC82>B
 <EFBFBD>@wolfssl\IDE\Renesas\cs+\Projects\wolfssl_lib\DefaultBuild\wolfssl_lib.lib
 <EFBFBD>@wolfssl\IDE\Renesas\cs+\Projects\t4_demo\DefaultBuild\t4_demo.lib

--- a/IDE/Renesas/cs+/Projects/t4_demo/wolf_main.c
+++ b/IDE/Renesas/cs+/Projects/t4_demo/wolf_main.c
@@ -25,12 +25,13 @@
 #include <stdint.h>

 #include "wolf_demo.h"
+#include "r_cmt_rx_if.h"

 static WOLFSSL_CTX *wolfSSL_sv_ctx;
 static WOLFSSL_CTX *wolfSSL_cl_ctx;

 static long tick;
-static void timeTick(void)
+static void timeTick(void *pdata)
 {
    tick++;
 }
--- a/IDE/Renesas/e2studio/Projects/README
+++ b/IDE/Renesas/e2studio/Projects/README
@@ -12,6 +12,7 @@ test:
  - set stack size in stacksct.h
  - replace lowlvl.src with sample project's lowlvl.src which you can download below.
    https://www.renesas.com/jp/ja/software/D3012028.html
+    * copy lowlvl.c and lowlvl.h in sample project's above into src directory of test project too.
  Build test wolfCrypt

-Setting MPU: R5F565MLCxFC
+Setting MPU: R5F565MLCxFC or R5F571MLDxFC
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -25704,13 +25704,12 @@ int wolfSSL_HMAC_Init_ex(WOLFSSL_HMAC_CTX* ctx, const void* key,
 * returns WOLFSSL_SUCCESS on success */
 int wolfSSL_HmacCopy(Hmac* des, Hmac* src)
 {
-    int ret    = 0;
    void* heap = NULL;

 #ifndef HAVE_FIPS
    heap = src->heap;
 #endif
-    if ((ret = wc_HmacInit(des, heap, 0)) != 0) {
+    if (wc_HmacInit(des, heap, 0) != 0) {
        return WOLFSSL_FAILURE;
    }

@@ -32145,7 +32144,6 @@ void* wolfSSL_GetDhAgreeCtx(WOLFSSL* ssl)
    {
        word32 oid = 0;
        word32 idx = 0;
-        int id;

        WOLFSSL_ENTER("wolfSSL_OBJ_obj2nid");

@@ -32154,7 +32152,7 @@ void* wolfSSL_GetDhAgreeCtx(WOLFSSL* ssl)
        }
        if (o->nid > 0)
            return o->nid;
-        if ((id = GetObjectId(o->obj, &idx, &oid, o->grp, o->objSz)) < 0) {
+        if (GetObjectId(o->obj, &idx, &oid, o->grp, o->objSz) < 0) {
            WOLFSSL_MSG("Issue getting OID of object");
            return -1;
        }