merge 3.4

This commit is contained in:
Benjamin Peterson 2015-09-27 02:14:23 -07:00
commit a18bd0e0f0
1 changed files with 2 additions and 2 deletions

View File

@ -486,8 +486,8 @@ PKCS5_PBKDF2_HMAC_fast(const char *pass, int passlen,
HMAC_CTX_cleanup(&hctx_tpl);
return 0;
}
while(tkeylen) {
if(tkeylen > mdlen)
while (tkeylen) {
if (tkeylen > mdlen)
cplen = mdlen;
else
cplen = tkeylen;