windows build fixes for new stuff

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

View File

@@ -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;