From 0d59d36a807d1607dbd421f0271b7de7d1602b7f Mon Sep 17 00:00:00 2001
From: Hideki Miyazaki <hide@wolfssl.com>
Date: Thu, 21 Apr 2022 18:57:31 +0900
Subject: [PATCH] update TSIP VER to 1.15 for RX65N and RX72N

fix -140 error when enabling -O2

fix no_crypto_hash
---
 .../e2studio/RX65N/RSK/wolfssl/.cproject      |  6 +++---
 .../e2studio/RX65N/RSK/wolfssl/wolfssl.rcpc   |  3 +--
 .../RX65N/RSK/wolfssl_demo/user_settings.h    |  6 +++++-
 .../RX72N/EnvisionKit/wolfssl/.cproject       |  6 ++++--
 .../RX72N/EnvisionKit/wolfssl/wolfssl.rcpc    | 12 ++++++++---
 .../EnvisionKit/wolfssl_demo/user_settings.h  | 12 ++++++++---
 .../EnvisionKit/wolfssl_demo/wolfssl_demo.c   | 16 +++++++++------
 wolfcrypt/src/port/Renesas/renesas_tsip_sha.c |  4 ++--
 .../src/port/Renesas/renesas_tsip_util.c      | 20 ++++++++++---------
 wolfcrypt/src/sha256.c                        |  2 +-
 10 files changed, 55 insertions(+), 32 deletions(-)

diff --git a/IDE/Renesas/e2studio/RX65N/RSK/wolfssl/.cproject b/IDE/Renesas/e2studio/RX65N/RSK/wolfssl/.cproject
index 3f8e394ad..36ab33606 100644
--- a/IDE/Renesas/e2studio/RX65N/RSK/wolfssl/.cproject
+++ b/IDE/Renesas/e2studio/RX65N/RSK/wolfssl/.cproject
@@ -14,7 +14,7 @@
 			</storageModule>
 			<storageModule moduleId="com.renesas.cdt.managedbuild.core.toolchainInfo">
 				<option id="toolchain.id" value="Renesas_RXC"/>
-				<option id="toolchain.version" value="v3.03.00"/>
+				<option id="toolchain.version" value="v3.04.00"/>
 				<option id="toolchain.enable" value="true"/>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
@@ -35,7 +35,7 @@
 								<option id="com.renesas.cdt.managedbuild.renesas.ccrx.common.option.checkRtos.313687436" name="Check RTOS" superClass="com.renesas.cdt.managedbuild.renesas.ccrx.common.option.checkRtos" useByScannerDiscovery="false" value="unusedRtos" valueType="string"/>
 								<option id="com.renesas.cdt.managedbuild.renesas.ccrx.common.option.hasDsp.963524125" name="Has DSP" superClass="com.renesas.cdt.managedbuild.renesas.ccrx.common.option.hasDsp" useByScannerDiscovery="false" value="false" valueType="string"/>
 								<option id="com.renesas.cdt.managedbuild.renesas.ccrx.common.option.deviceFamily.664031971" name="Device Family" superClass="com.renesas.cdt.managedbuild.renesas.ccrx.common.option.deviceFamily" useByScannerDiscovery="false" value="RX65N" valueType="string"/>
-								<option id="com.renesas.cdt.managedbuild.renesas.ccrx.common.option.deviceHistory.1128940076" name="Device history" superClass="com.renesas.cdt.managedbuild.renesas.ccrx.common.option.deviceHistory" useByScannerDiscovery="false" value="R5F572NNHxFB;R5F565NEHxFC;R5F565NEDxFC" valueType="string"/>
+								<option id="com.renesas.cdt.managedbuild.renesas.ccrx.common.option.deviceHistory.1128940076" name="Device history" superClass="com.renesas.cdt.managedbuild.renesas.ccrx.common.option.deviceHistory" useByScannerDiscovery="false" value="R5F565NEHxFC;R5F565NEDxFC" valueType="string"/>
 								<option id="com.renesas.cdt.managedbuild.renesas.ccrx.common.option.rxArchitecture.1334393839" name="RX Architecture" superClass="com.renesas.cdt.managedbuild.renesas.ccrx.common.option.rxArchitecture" value="rxv2" valueType="string"/>
 								<option id="com.renesas.cdt.managedbuild.renesas.ccrx.common.option.floatIns.1627839884" name="浮動小数点演算命令を使用する (-fpu/-nofpu)" superClass="com.renesas.cdt.managedbuild.renesas.ccrx.common.option.floatIns" value="com.renesas.cdt.managedbuild.renesas.ccrx.common.option.floatIns.yes" valueType="enumerated"/>
 								<option id="com.renesas.cdt.managedbuild.renesas.ccrx.common.option.isaHistory.1548751985" name="ISA history" superClass="com.renesas.cdt.managedbuild.renesas.ccrx.common.option.isaHistory" value="non_init;com.renesas.cdt.managedbuild.renesas.ccrx.common.option.isa.rxv2" valueType="string"/>
@@ -61,7 +61,7 @@
 									<listOptionValue builtIn="false" value="WOLFSSL_USER_SETTINGS"/>
 								</option>
 								<option id="com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.langFileC.1494793389" name="Cソース (-lang)" superClass="com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.langFileC" useByScannerDiscovery="false" value="com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.langFileC.c99" valueType="enumerated"/>
-								<option id="com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.optimize.573554071" name="最適化レベル (-optimize)" superClass="com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.optimize" useByScannerDiscovery="false" value="com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.optimize.level0" valueType="enumerated"/>
+								<option id="com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.optimize.573554071" name="最適化レベル (-optimize)" superClass="com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.optimize" useByScannerDiscovery="false" value="com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.optimize.level2" valueType="enumerated"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.userBefore.1331174374" name="追加するオプション（すべての指定オプションの前に追加）" superClass="com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.userBefore" valueType="stringList">
 									<listOptionValue builtIn="false" value=""/>
 								</option>
diff --git a/IDE/Renesas/e2studio/RX65N/RSK/wolfssl/wolfssl.rcpc b/IDE/Renesas/e2studio/RX65N/RSK/wolfssl/wolfssl.rcpc
index 48de27cdb..da2fa15e2 100644
--- a/IDE/Renesas/e2studio/RX65N/RSK/wolfssl/wolfssl.rcpc
+++ b/IDE/Renesas/e2studio/RX65N/RSK/wolfssl/wolfssl.rcpc
@@ -88,7 +88,7 @@
       </Category>
     </Files>
     <Device Category="com.renesas.cdt.managedbuild.renesas.ccrx.common.option.cpu.rx600" Series="RX">R5F565NEDxFC</Device>
-    <BuildOptions Name="CC-RX" Version="v3.03.00">
+    <BuildOptions Name="CC-RX" Version="v3.04.00">
       <BuildMode Active="True" Name="Debug">
         <GeneralOptions/>
         <CompileOptions>
@@ -111,7 +111,6 @@
           <Option>-nomessage</Option>
           <Option>-debug</Option>
           <Option>-outcode=utf8</Option>
-          <Option>-optimize=0</Option>
           <Option>-nologo</Option>
           <Option>-lang=c99</Option>
           <Option>-lang=cpp</Option>
diff --git a/IDE/Renesas/e2studio/RX65N/RSK/wolfssl_demo/user_settings.h b/IDE/Renesas/e2studio/RX65N/RSK/wolfssl_demo/user_settings.h
index b1f676d1e..43021a4a3 100644
--- a/IDE/Renesas/e2studio/RX65N/RSK/wolfssl_demo/user_settings.h
+++ b/IDE/Renesas/e2studio/RX65N/RSK/wolfssl_demo/user_settings.h
@@ -36,9 +36,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  --------------------------------------------------
@@ -219,3 +220,6 @@
     #define HAVE_HKDF
     #define WC_RSA_PSS
 #endif
+
+/*-- strcasecmp */
+#define XSTRCASECMP(s1,s2) strcmp((s1),(s2))
diff --git a/IDE/Renesas/e2studio/RX72N/EnvisionKit/wolfssl/.cproject b/IDE/Renesas/e2studio/RX72N/EnvisionKit/wolfssl/.cproject
index 68467fab1..8c4057e00 100644
--- a/IDE/Renesas/e2studio/RX72N/EnvisionKit/wolfssl/.cproject
+++ b/IDE/Renesas/e2studio/RX72N/EnvisionKit/wolfssl/.cproject
@@ -14,7 +14,7 @@
 			</storageModule>
 			<storageModule moduleId="com.renesas.cdt.managedbuild.core.toolchainInfo">
 				<option id="toolchain.id" value="Renesas_RXC"/>
-				<option id="toolchain.version" value="v3.03.00"/>
+				<option id="toolchain.version" value="v3.04.00"/>
 				<option id="toolchain.enable" value="true"/>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
@@ -27,7 +27,7 @@
 								<option id="com.renesas.cdt.managedbuild.renesas.ccrx.dsp.option.noDebugInfo.317830941" name="デバッグ情報を出力する (-no_debug_info)" superClass="com.renesas.cdt.managedbuild.renesas.ccrx.dsp.option.noDebugInfo" useByScannerDiscovery="false" value="true" valueType="boolean"/>
 							</tool>
 							<tool id="com.renesas.cdt.managedbuild.renesas.ccrx.base.common.566285610" name="Common" superClass="com.renesas.cdt.managedbuild.renesas.ccrx.base.common">
-								<option id="com.renesas.cdt.managedbuild.renesas.ccrx.common.option.isa.789156168" name="命令セット・アーキテクチャ (-isa)" superClass="com.renesas.cdt.managedbuild.renesas.ccrx.common.option.isa" useByScannerDiscovery="false" value="com.renesas.cdt.managedbuild.renesas.ccrx.common.option.isa.rxv2" valueType="enumerated"/>
+								<option id="com.renesas.cdt.managedbuild.renesas.ccrx.common.option.isa.789156168" name="命令セット・アーキテクチャ (-isa)" superClass="com.renesas.cdt.managedbuild.renesas.ccrx.common.option.isa" useByScannerDiscovery="false" value="com.renesas.cdt.managedbuild.renesas.ccrx.common.option.isa.rxv3" valueType="enumerated"/>
 								<option id="com.renesas.cdt.managedbuild.renesas.ccrx.common.option.hasFpu.1416683217" name="Has FPU" superClass="com.renesas.cdt.managedbuild.renesas.ccrx.common.option.hasFpu" useByScannerDiscovery="false" value="TRUE" valueType="string"/>
 								<option id="com.renesas.cdt.managedbuild.renesas.ccrx.common.option.deviceName.738625467" name="Device Name" superClass="com.renesas.cdt.managedbuild.renesas.ccrx.common.option.deviceName" useByScannerDiscovery="false" value="R5F572NNHxFB" valueType="string"/>
 								<option id="com.renesas.cdt.managedbuild.renesas.ccrx.common.option.deviceCommand.806008705" name="Device Command" superClass="com.renesas.cdt.managedbuild.renesas.ccrx.common.option.deviceCommand" useByScannerDiscovery="false" value="R5F572NN" valueType="string"/>
@@ -35,6 +35,8 @@
 								<option id="com.renesas.cdt.managedbuild.renesas.ccrx.common.option.hasDsp.963524125" name="Has DSP" superClass="com.renesas.cdt.managedbuild.renesas.ccrx.common.option.hasDsp" useByScannerDiscovery="false" value="false" valueType="string"/>
 								<option id="com.renesas.cdt.managedbuild.renesas.ccrx.common.option.deviceFamily.664031971" name="Device Family" superClass="com.renesas.cdt.managedbuild.renesas.ccrx.common.option.deviceFamily" useByScannerDiscovery="false" value="RX72N" valueType="string"/>
 								<option id="com.renesas.cdt.managedbuild.renesas.ccrx.common.option.deviceHistory.1128940076" name="Device history" superClass="com.renesas.cdt.managedbuild.renesas.ccrx.common.option.deviceHistory" useByScannerDiscovery="false" value="non_init;R5F572NNHxFB" valueType="string"/>
+								<option id="com.renesas.cdt.managedbuild.renesas.ccrx.common.option.doublePrecisionFPU.1794174354" name="倍精度浮動小数点処理命令を使用する (-dpfpu/-nodpfpu)" superClass="com.renesas.cdt.managedbuild.renesas.ccrx.common.option.doublePrecisionFPU" useByScannerDiscovery="false" value="true" valueType="boolean"/>
+								<option id="com.renesas.cdt.managedbuild.renesas.ccrx.common.option.floatIns.1365779106" name="浮動小数点演算命令を使用する (-fpu/-nofpu)" superClass="com.renesas.cdt.managedbuild.renesas.ccrx.common.option.floatIns" useByScannerDiscovery="false" value="com.renesas.cdt.managedbuild.renesas.ccrx.common.option.floatIns.yes" valueType="enumerated"/>
 							</tool>
 							<tool id="com.renesas.cdt.managedbuild.renesas.ccrx.base.compiler.958103973" name="Compiler" superClass="com.renesas.cdt.managedbuild.renesas.ccrx.base.compiler">
 								<option id="com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.fpu.1276851320" name="浮動小数点演算命令を使用する (-fpu/-nofpu)" superClass="com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.fpu" useByScannerDiscovery="false" value="com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.fpu.yes" valueType="enumerated"/>
diff --git a/IDE/Renesas/e2studio/RX72N/EnvisionKit/wolfssl/wolfssl.rcpc b/IDE/Renesas/e2studio/RX72N/EnvisionKit/wolfssl/wolfssl.rcpc
index d2dca8535..81dec5b61 100644
--- a/IDE/Renesas/e2studio/RX72N/EnvisionKit/wolfssl/wolfssl.rcpc
+++ b/IDE/Renesas/e2studio/RX72N/EnvisionKit/wolfssl/wolfssl.rcpc
@@ -88,11 +88,13 @@
       </Category>
     </Files>
     <Device Category="com.renesas.cdt.managedbuild.renesas.ccrx.common.option.cpu.rx600" Series="RX">R5F572NNHxFB</Device>
-    <BuildOptions Name="CC-RX" Version="v3.03.00">
+    <BuildOptions Name="CC-RX" Version="v3.04.00">
       <BuildMode Active="True" Name="Debug">
         <GeneralOptions/>
         <CompileOptions>
-          <Option>-isa=rxv2</Option>
+          <Option>-isa=rxv3</Option>
+          <Option>-fpu</Option>
+          <Option>-dpfpu</Option>
           <Option>-include="${ProjDirPath}\..\..\..\..\..\..\"</Option>
           <Option>-include="${ProjDirPath}\..\..\..\..\..\..\..\demos"</Option>
           <Option>-include="${ProjDirPath}\..\..\..\..\..\..\..\freertos_kernel\include"</Option>
@@ -106,6 +108,7 @@
           <Option>-include="${ProjDirPath}\..\..\..\..\..\..\..\vendors\renesas\boards\rx72n-envision-kit\aws_demos\src\smc_gen\r_tsip_rx"</Option>
           <Option>-include="${ProjDirPath}\..\wolfssl_demo"</Option>
           <Option>-define=WOLFSSL_USER_SETTINGS</Option>
+          <Option>-asmopt=-bank</Option>
           <Option>-nomessage</Option>
           <Option>-debug</Option>
           <Option>-tfu=intrinsic</Option>
@@ -116,7 +119,10 @@
           <Option>-obj_path=${CONFIGDIR}</Option>
         </CompileOptions>
         <AssembleOptions>
-          <Option>-isa=rxv2</Option>
+          <Option>-isa=rxv3</Option>
+          <Option>-fpu</Option>
+          <Option>-dpfpu</Option>
+          <Option>-bank</Option>
           <Option>-debug</Option>
           <Option>-nologo</Option>
           <Option>-output=${CONFIGDIR}</Option>
diff --git a/IDE/Renesas/e2studio/RX72N/EnvisionKit/wolfssl_demo/user_settings.h b/IDE/Renesas/e2studio/RX72N/EnvisionKit/wolfssl_demo/user_settings.h
index 369a883e4..3a8cd4043 100644
--- a/IDE/Renesas/e2studio/RX72N/EnvisionKit/wolfssl_demo/user_settings.h
+++ b/IDE/Renesas/e2studio/RX72N/EnvisionKit/wolfssl_demo/user_settings.h
@@ -36,9 +36,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  --------------------------------------------------
@@ -60,8 +61,10 @@
 #define FREERTOS
 #define FREERTOS_TCP
 
-
-
+#if !defined(FREERTOS_TCP)
+ #define WOLFSSL_NO_SOCK
+ #define WOLFSSL_USER_IO
+#endif
 
 /*-- Cipher related definitions  -----------------------------------------------
  *
@@ -219,3 +222,6 @@
     #define HAVE_HKDF
     #define WC_RSA_PSS
 #endif
+
+/*-- strcasecmp */
+#define XSTRCASECMP(s1,s2) strcmp((s1),(s2))
diff --git a/IDE/Renesas/e2studio/RX72N/EnvisionKit/wolfssl_demo/wolfssl_demo.c b/IDE/Renesas/e2studio/RX72N/EnvisionKit/wolfssl_demo/wolfssl_demo.c
index b5c4e1c5e..060e5cc72 100644
--- a/IDE/Renesas/e2studio/RX72N/EnvisionKit/wolfssl_demo/wolfssl_demo.c
+++ b/IDE/Renesas/e2studio/RX72N/EnvisionKit/wolfssl_demo/wolfssl_demo.c
@@ -24,11 +24,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "FreeRTOS.h"
-#include "FreeRTOS_IP.h"
-#include "FreeRTOS_Sockets.h"
-#include "platform/iot_network.h"
-#include "platform.h"
+
 
 
 #include <wolfssl/wolfcrypt/settings.h>
@@ -40,6 +36,14 @@
 #include <wolfcrypt/test/test.h>
 #include <wolfcrypt/benchmark/benchmark.h>
 
+#include "FreeRTOS.h"
+#if defined(FREERTOS_TCP)
+#include "FreeRTOS_IP.h"
+#include "FreeRTOS_Sockets.h"
+#include "platform/iot_network.h"
+#include "platform.h"
+#endif
+
 #if defined(BENCHMARK)
     #include "r_cmt_rx_if.h"
 #endif
@@ -60,7 +64,7 @@
     static WOLFSSL_CTX* client_ctx;
 #endif /* TLS_CLIENT */
 
-#define TLSSERVER_IP      "192.168.1.12"
+#define TLSSERVER_IP      "192.168.11.49"
 #define TLSSERVER_PORT    11111
 #define YEAR 2022
 #define MON  3
diff --git a/wolfcrypt/src/port/Renesas/renesas_tsip_sha.c b/wolfcrypt/src/port/Renesas/renesas_tsip_sha.c
index fad30640d..bcf047c8f 100644
--- a/wolfcrypt/src/port/Renesas/renesas_tsip_sha.c
+++ b/wolfcrypt/src/port/Renesas/renesas_tsip_sha.c
@@ -35,7 +35,7 @@
 #include <wolfssl/wolfcrypt/error-crypt.h>
 #include <wolfssl/wolfcrypt/port/Renesas/renesas-tsip-crypt.h>
 
-#if !defined(NO_SHA)
+#if !defined(NO_SHA) && !defined(NO_WOLFSSL_RENESAS_TSIP_CRYPT_HASH)
 #include <wolfssl/wolfcrypt/sha.h>
 
 static void TSIPHashFree(wolfssl_TSIP_Hash* hash)
@@ -246,7 +246,7 @@ int wc_ShaCopy(wc_Sha256* src, wc_Sha256* dst)
 }
 #endif /* !NO_SHA */
 
-#if !defined(NO_SHA256)
+#if !defined(NO_SHA256) && !defined(NO_WOLFSSL_RENESAS_TSIP_CRYPT_HASH)
 #include <wolfssl/wolfcrypt/sha256.h>
 
 /*  */
diff --git a/wolfcrypt/src/port/Renesas/renesas_tsip_util.c b/wolfcrypt/src/port/Renesas/renesas_tsip_util.c
index f4a5536ca..620ecd91d 100644
--- a/wolfcrypt/src/port/Renesas/renesas_tsip_util.c
+++ b/wolfcrypt/src/port/Renesas/renesas_tsip_util.c
@@ -43,10 +43,12 @@ typedef e_tsip_err_t (*shaHmacFinalFn)
 
 /* ./ca-cert.der.sign,  */
 /* expect to have these variables defined at user application */
+#if defined(WOLFSSL_RENESAS_TSIP_TLS) && (WOLFSSL_RENESAS_TSIP_VER>=109)
+extern uint32_t     s_inst2[R_TSIP_SINST2_WORD_SIZE];
+#elif defined(WOLFSSL_RENESAS_TSIP_TLS) && (WOLFSSL_RENESAS_TSIP_VER>=106)
 extern uint32_t     s_flash[];
 extern uint32_t     s_inst1[R_TSIP_SINST_WORD_SIZE];
-extern uint32_t     s_inst2[R_TSIP_SINST2_WORD_SIZE];
-
+#endif
 
 wolfSSL_Mutex       tsip_mutex;
 static int          tsip_CryptHwMutexInit_ = 0;
@@ -267,7 +269,7 @@ int wc_tsip_EccVerify(
         int*  result,       void*  ctx)
 {
     int         ret = WOLFSSL_FAILURE;
-    uint8_t*    sigforSCE;
+    uint8_t*    sigforSCE = NULL;
     uint8_t*    pSig;
     const byte  rs_size = R_TSIP_ECDSA_DATA_BYTE_SIZE/2;
     byte        offset = 0x3;
@@ -557,18 +559,18 @@ int tsip_usable(const struct WOLFSSL *ssl, uint8_t session_key_generated)
     /* Check if TSIP can handle cipher suite */
     if (ret == WOLFSSL_SUCCESS) {
         if (
-            cipher0 == CIPHER_BYTE &&
+            (cipher0 == CIPHER_BYTE &&
             (cipher == l_TLS_RSA_WITH_AES_128_CBC_SHA ||
              cipher == l_TLS_RSA_WITH_AES_128_CBC_SHA256 ||
              cipher == l_TLS_RSA_WITH_AES_256_CBC_SHA ||
-             cipher == l_TLS_RSA_WITH_AES_256_CBC_SHA256)
+             cipher == l_TLS_RSA_WITH_AES_256_CBC_SHA256))
         #if (WOLFSSL_RENESAS_TSIP_VER >= TSIP109)
             ||
-            cipher0 == ECC_BYTE &&
+            (cipher0 == ECC_BYTE &&
             (cipher == l_TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256 ||
              cipher == l_TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256 ||
              cipher == l_TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 ||
-             cipher == l_TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256)
+             cipher == l_TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256))
         #endif
         ) {
             WOLFSSL_MSG("supported cipher suite");
@@ -1355,7 +1357,7 @@ int wc_tsip_tls_CertVerify(
         uint8_t*      tsip_encRsaKeyIndex)
 {
     int ret;
-    uint8_t *sigforSCE;
+    uint8_t *sigforSCE = NULL;
     uint8_t *pSig;
     const byte rs_size = 0x20;
     byte offset = 0x3;
@@ -1384,7 +1386,7 @@ int wc_tsip_tls_CertVerify(
             return MEMORY_E;
         }
         /* initialization */
-        XMEMCPY(sigforSCE, 0, R_TSIP_ECDSA_DATA_BYTE_SIZE);
+        XMEMSET(sigforSCE, 0, R_TSIP_ECDSA_DATA_BYTE_SIZE);
 
         if (signature[offset] == 0x20) {
             XMEMCPY(sigforSCE, &signature[offset+1], rs_size);
diff --git a/wolfcrypt/src/sha256.c b/wolfcrypt/src/sha256.c
index c893b05e4..0b231669b 100644
--- a/wolfcrypt/src/sha256.c
+++ b/wolfcrypt/src/sha256.c
@@ -182,7 +182,7 @@ where 0 <= L < 2^64.
      defined(WOLFSSL_QNX_CAAM)) && \
     !defined(WOLFSSL_AFALG_HASH) && !defined(WOLFSSL_DEVCRYPTO_HASH) && \
     (!defined(WOLFSSL_ESP32WROOM32_CRYPT) || defined(NO_WOLFSSL_ESP32WROOM32_CRYPT_HASH)) && \
-    (!defined(WOLFSSL_RENESAS_TSIP_CRYPT) || defined(NO_WOLFSSL_RENESAS_TSIP_HASH)) && \
+    (!defined(WOLFSSL_RENESAS_TSIP_CRYPT) || defined(NO_WOLFSSL_RENESAS_TSIP_CRYPT_HASH)) && \
     !defined(WOLFSSL_PSOC6_CRYPTO) && !defined(WOLFSSL_IMXRT_DCP) && !defined(WOLFSSL_SILABS_SE_ACCEL) && \
     !defined(WOLFSSL_KCAPI_HASH) && !defined(WOLFSSL_SE050_HASH) && \
     (!defined(WOLFSSL_RENESAS_SCEPROTECT) || defined(NO_WOLFSSL_RENESAS_SCEPROTECT_HASH)) && \