feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #4698 from JacobBarthelmeh/Jenkins

Browse Source 
fix for user_settings_all.h build on 'VS' and build with libz + pkcs7 test
This commit is contained in:
David Garske
2021-12-23 16:54:40 -08:00
committed by GitHub
parent 37925e0b6a c4e50ef086
commit a75e152b93
4 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/wolfio.c
View File

@ -1030,7 +1030,7 @@ int wolfIO_TcpBind(SOCKET_T* sockfd, word16 port)
#ifdef HAVE_SOCKADDR #ifdef HAVE_SOCKADDR
int wolfIO_TcpAccept(SOCKET_T sockfd, SOCKADDR* peer_addr, XSOCKLENT* peer_len) int wolfIO_TcpAccept(SOCKET_T sockfd, SOCKADDR* peer_addr, XSOCKLENT* peer_len)
{ {
return accept(sockfd, peer_addr, peer_len); return (int)accept(sockfd, peer_addr, peer_len);
} }
#endif /* HAVE_SOCKADDR */ #endif /* HAVE_SOCKADDR */

2
wolfcrypt/src/pkcs7.c
View File

@ -5008,7 +5008,7 @@ static int PKCS7_VerifySignedData(PKCS7* pkcs7, const byte* hashBuf,
version = pkcs7->version; version = pkcs7->version;
if (ret == 0) { if (ret == 0) {
byte isDynamic = pkcs7->isDynamic; byte isDynamic = (byte)pkcs7->isDynamic;
#ifndef NO_PKCS7_STREAM #ifndef NO_PKCS7_STREAM
PKCS7State* stream = pkcs7->stream; PKCS7State* stream = pkcs7->stream;
pkcs7->stream = NULL; pkcs7->stream = NULL;

2
wolfcrypt/test/test.c
View File

@ -34259,7 +34259,7 @@ static int pkcs7signed_run_SingleShotVectors(
/* compare decompressed to expected */ /* compare decompressed to expected */
if (((word32)ret != testVectors[i].contentSz) || if (((word32)ret != testVectors[i].contentSz) ||
XMEMCMP(out, testVectors[i].content, ret)) { XMEMCMP(out, testVectors[i].content, ret))
ERROR_OUT(-12562, out); ERROR_OUT(-12562, out);
} }
#ifndef NO_PKCS7_ENCRYPTED_DATA #ifndef NO_PKCS7_ENCRYPTED_DATA

1
wolfssl.vcxproj
View File

@ -305,6 +305,7 @@
<ClCompile Include="wolfcrypt\src\ed448.c" /> <ClCompile Include="wolfcrypt\src\ed448.c" />
<ClCompile Include="wolfcrypt\src\error.c" /> <ClCompile Include="wolfcrypt\src\error.c" />
<ClCompile Include="wolfcrypt\src\fe_448.c" /> <ClCompile Include="wolfcrypt\src\fe_448.c" />
<ClCompile Include="wolfcrypt\src\fe_low_mem.c" />
<ClCompile Include="wolfcrypt\src\fe_operations.c" /> <ClCompile Include="wolfcrypt\src\fe_operations.c" />
<ClCompile Include="wolfcrypt\src\ge_448.c" /> <ClCompile Include="wolfcrypt\src\ge_448.c" />
<ClCompile Include="wolfcrypt\src\ge_low_mem.c" /> <ClCompile Include="wolfcrypt\src\ge_low_mem.c" />