mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge 3.5

Browse source
This commit is contained in:
Benjamin Peterson 2015-09-27 02:14:29 -07:00
commit eca7172c3c
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Modules/_hashopenssl.c
View file

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