wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 12:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

windows build fixes for new stuff

Browse Source
This commit is contained in:
Todd A Ouska
2011-04-28 16:34:42 -07:00
parent b6be0545ab
commit 906e5c19ad
3 changed files with 387 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ctaocrypt/src/pwdbased.c
View File

@@ -293,7 +293,7 @@ int PKCS12_PBKDF(byte* output, const byte* passwd, int passLen,const byte* salt,
if (ret < 0) break; if (ret < 0) break;
} }
currentLen = min(kLen, u); currentLen = min(kLen, (int)u);
XMEMCPY(output, Ai, currentLen); XMEMCPY(output, Ai, currentLen);
output += currentLen; output += currentLen;
kLen -= currentLen; kLen -= currentLen;

8
cyassl.vcproj
View File

@@ -178,6 +178,10 @@
RelativePath=".\src\cyassl_io.c" RelativePath=".\src\cyassl_io.c"
> >
</File> </File>
<File
RelativePath=".\ctaocrypt\src\cyassl_memory.c"
>
</File>
<File <File
RelativePath=".\ctaocrypt\src\des3.c" RelativePath=".\ctaocrypt\src\des3.c"
> >
@@ -206,6 +210,10 @@
RelativePath=".\src\keys.c" RelativePath=".\src\keys.c"
> >
</File> </File>
<File
RelativePath=".\ctaocrypt\src\logging.c"
>
</File>
<File <File
RelativePath=".\ctaocrypt\src\md4.c" RelativePath=".\ctaocrypt\src\md4.c"
> >

2
src/ssl.c
View File

@@ -679,7 +679,7 @@ int AddCA(SSL_CTX* ctx, buffer der)
long consumed = info.consumed; long consumed = info.consumed;
word32 idx = 0; word32 idx = 0;
if ( (sz - consumed) > bufferSz) { if ( (sz - consumed) > (int)bufferSz) {
CYASSL_MSG("Growing Tmp Chain Buffer"); CYASSL_MSG("Growing Tmp Chain Buffer");
bufferSz = sz - consumed; /* will shrink to actual size */ bufferSz = sz - consumed; /* will shrink to actual size */
chainBuffer = (byte*)XMALLOC(bufferSz, ctx->heap, chainBuffer = (byte*)XMALLOC(bufferSz, ctx->heap,