diff --git a/IDE/INTIME-RTOS/libwolfssl.vcxproj b/IDE/INTIME-RTOS/libwolfssl.vcxproj
index 5fc200943..85bb1d783 100755
--- a/IDE/INTIME-RTOS/libwolfssl.vcxproj
+++ b/IDE/INTIME-RTOS/libwolfssl.vcxproj
@@ -27,7 +27,6 @@
-
@@ -40,7 +39,6 @@
-
@@ -192,12 +190,8 @@
Async
- _USRDLL;WOLFSSL_DLL;BUILDING_WOLFSSL;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)
+ _USRDLL;WOLFSSL_DLL;BUILDING_WOLFSSL;WOLFSSL_USER_SETTINGS;_USE_64BIT_TIME_T;%(PreprocessorDefinitions)
$(ProjectDir);$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)
- $(IntDir)
- $(IntDir)
- $(IntDir)
- $(IntDir)vc$(PlatformToolsetVersion).pdb
@@ -211,12 +205,8 @@
Async
- _USRDLL;WOLFSSL_DLL;BUILDING_WOLFSSL;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)
+ _USRDLL;WOLFSSL_DLL;BUILDING_WOLFSSL;WOLFSSL_USER_SETTINGS;_USE_64BIT_TIME_T;%(PreprocessorDefinitions)
$(ProjectDir);$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)
- $(IntDir)
- $(IntDir)
- $(IntDir)
- $(IntDir)vc$(PlatformToolsetVersion).pdb
diff --git a/IDE/INTIME-RTOS/wolfExamples.vcxproj b/IDE/INTIME-RTOS/wolfExamples.vcxproj
index 81f82318e..81b1e6d4f 100755
--- a/IDE/INTIME-RTOS/wolfExamples.vcxproj
+++ b/IDE/INTIME-RTOS/wolfExamples.vcxproj
@@ -68,10 +68,6 @@
Async
WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)
$(ProjectDir);$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)
- $(IntDir)
- $(IntDir)
- $(IntDir)vc$(PlatformToolsetVersion).pdb
- $(IntDir)
@@ -88,10 +84,7 @@
Async
WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)
$(ProjectDir);$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)
- $(IntDir)
- $(IntDir)
$(IntDir)vc$(PlatformToolsetVersion).pdb
- $(IntDir)
diff --git a/wolfcrypt/test/test.c b/wolfcrypt/test/test.c
index df451da0f..baf590a4b 100644
--- a/wolfcrypt/test/test.c
+++ b/wolfcrypt/test/test.c
@@ -13178,7 +13178,7 @@ int openssl_pkey0_test(void)
printf("error with encrypt init\n");
return ERR_BASE_PKEY-17;
}
- memset(out, 0, sizeof(out));
+ XMEMSET(out, 0, sizeof(out));
ret = EVP_PKEY_encrypt(enc, out, &outlen, in, sizeof(in));
if (ret != 1) {
printf("error encrypting msg\n");
@@ -13187,7 +13187,7 @@ int openssl_pkey0_test(void)
show("encrypted msg", out, outlen);
- memset(plain, 0, sizeof(plain));
+ XMEMSET(plain, 0, sizeof(plain));
ret = EVP_PKEY_decrypt(dec, plain, &outlen, out, keySz);
if (ret != 1) {
printf("error decrypting msg\n");
@@ -13224,7 +13224,7 @@ int openssl_pkey0_test(void)
}
#endif
- memset(out, 0, sizeof(out));
+ XMEMSET(out, 0, sizeof(out));
ret = EVP_PKEY_encrypt(enc, out, &outlen, in, sizeof(in));
if (ret != 1) {
printf("error encrypting msg\n");
@@ -13233,7 +13233,7 @@ int openssl_pkey0_test(void)
show("encrypted msg", out, outlen);
- memset(plain, 0, sizeof(plain));
+ XMEMSET(plain, 0, sizeof(plain));
ret = EVP_PKEY_decrypt(dec, plain, &outlen, out, keySz);
if (ret != 1) {
printf("error decrypting msg\n");
@@ -13524,7 +13524,7 @@ int openssl_evpSig_test()
show("message = ", (char *)msg, count);
/* sign */
- memset(sig, 0, sizeof(sig));
+ XMEMSET(sig, 0, sizeof(sig));
pt = (const void*)msg;
ret1 = EVP_SignUpdate(sign, pt, count);
ret2 = EVP_SignFinal(sign, sig, &sigSz, prvPkey);
@@ -16336,6 +16336,9 @@ int ecc_test_buffers(void) {
int verify = 0;
word32 x;
+ XMEMSET(&cliKey, 0, sizeof(ecc_key));
+ XMEMSET(&servKey, 0, sizeof(ecc_key));
+
bytes = (size_t)sizeof_ecc_clikey_der_256;
/* place client key into ecc_key struct cliKey */
ret = wc_EccPrivateKeyDecode(ecc_clikey_der_256, &idx, &cliKey,
@@ -19166,7 +19169,7 @@ int blob_test(void)
};
- memset(blob, 0, sizeof(blob));
+ XMEMSET(blob, 0, sizeof(blob));
outSz = sizeof(blob);
ret = wc_caamCreateBlob((byte*)iv, sizeof(iv), blob, &outSz);
if (ret != 0) {
@@ -19179,7 +19182,7 @@ int blob_test(void)
ERROR_OUT(-10101, exit_blob);
}
- memset(blob, 0, sizeof(blob));
+ XMEMSET(blob, 0, sizeof(blob));
outSz = sizeof(blob);
ret = wc_caamCreateBlob((byte*)iv, sizeof(iv), blob, &outSz);
if (ret != 0) {
@@ -19195,7 +19198,7 @@ int blob_test(void)
ERROR_OUT(-10104, exit_blob);
}
- memset(blob, 0, sizeof(blob));
+ XMEMSET(blob, 0, sizeof(blob));
outSz = sizeof(blob);
ret = wc_caamCreateBlob((byte*)text, sizeof(text), blob, &outSz);
if (ret != 0) {
diff --git a/wolfssl/test.h b/wolfssl/test.h
index f446828db..b55c395b5 100644
--- a/wolfssl/test.h
+++ b/wolfssl/test.h
@@ -647,7 +647,7 @@ static INLINE void build_addr(SOCKADDR_IN_T* addr, const char* peer,
if (addr == NULL)
err_sys("invalid argument to build_addr, addr is NULL");
- memset(addr, 0, sizeof(SOCKADDR_IN_T));
+ XMEMSET(addr, 0, sizeof(SOCKADDR_IN_T));
#ifndef TEST_IPV6
/* peer could be in human readable form */
@@ -700,7 +700,7 @@ static INLINE void build_addr(SOCKADDR_IN_T* addr, const char* peer,
int ret;
char strPort[80];
- memset(&hints, 0, sizeof(hints));
+ XMEMSET(&hints, 0, sizeof(hints));
hints.ai_family = AF_INET_V;
if (udp) {
@@ -1430,7 +1430,7 @@ static INLINE int myDateCb(int preverify, WOLFSSL_X509_STORE_CTX* store)
#ifdef HAVE_EXT_CACHE
-static INLINE WOLFSSL_SESSION* mySessGetCb(WOLFSSL* ssl, unsigned char* id,
+static INLINE WOLFSSL_SESSION* mySessGetCb(WOLFSSL* ssl, unsigned char* id,
int id_len, int* copy)
{
(void)ssl;
@@ -1860,14 +1860,14 @@ static INLINE void SetupAtomicUser(WOLFSSL_CTX* ctx, WOLFSSL* ssl)
encCtx = (AtomicEncCtx*)malloc(sizeof(AtomicEncCtx));
if (encCtx == NULL)
err_sys("AtomicEncCtx malloc failed");
- memset(encCtx, 0, sizeof(AtomicEncCtx));
+ XMEMSET(encCtx, 0, sizeof(AtomicEncCtx));
decCtx = (AtomicDecCtx*)malloc(sizeof(AtomicDecCtx));
if (decCtx == NULL) {
free(encCtx);
err_sys("AtomicDecCtx malloc failed");
}
- memset(decCtx, 0, sizeof(AtomicDecCtx));
+ XMEMSET(decCtx, 0, sizeof(AtomicDecCtx));
wolfSSL_CTX_SetMacEncryptCb(ctx, myMacEncryptCb);
wolfSSL_SetMacEncryptCtx(ssl, encCtx);