mirror of
https://github.com/wolfSSL/wolfssl.git
synced 2025-08-02 04:04:39 +02:00
windows build fixes for new stuff
This commit is contained in:
@@ -293,7 +293,7 @@ int PKCS12_PBKDF(byte* output, const byte* passwd, int passLen,const byte* salt,
|
||||
if (ret < 0) break;
|
||||
}
|
||||
|
||||
currentLen = min(kLen, u);
|
||||
currentLen = min(kLen, (int)u);
|
||||
XMEMCPY(output, Ai, currentLen);
|
||||
output += currentLen;
|
||||
kLen -= currentLen;
|
||||
|
@@ -178,6 +178,10 @@
|
||||
RelativePath=".\src\cyassl_io.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\ctaocrypt\src\cyassl_memory.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\ctaocrypt\src\des3.c"
|
||||
>
|
||||
@@ -206,6 +210,10 @@
|
||||
RelativePath=".\src\keys.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\ctaocrypt\src\logging.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\ctaocrypt\src\md4.c"
|
||||
>
|
||||
|
@@ -679,7 +679,7 @@ int AddCA(SSL_CTX* ctx, buffer der)
|
||||
long consumed = info.consumed;
|
||||
word32 idx = 0;
|
||||
|
||||
if ( (sz - consumed) > bufferSz) {
|
||||
if ( (sz - consumed) > (int)bufferSz) {
|
||||
CYASSL_MSG("Growing Tmp Chain Buffer");
|
||||
bufferSz = sz - consumed; /* will shrink to actual size */
|
||||
chainBuffer = (byte*)XMALLOC(bufferSz, ctx->heap,
|
||||
|
Reference in New Issue
Block a user