diff options
author | Benjamin Peterson <benjamin@python.org> | 2015-09-27 09:14:29 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2015-09-27 09:14:29 (GMT) |
commit | eca7172c3c263affcdb881272b56fb7811cc9505 (patch) | |
tree | 274c3319c233890b39c3ac49b0d8e68b20488c8f | |
parent | bb6c1c5a7e21d6f10ba065c319c352be2852a5b8 (diff) | |
parent | a18bd0e0f0dc4ad8dd52c4c39fec730dbd283cc5 (diff) | |
download | cpython-eca7172c3c263affcdb881272b56fb7811cc9505.zip cpython-eca7172c3c263affcdb881272b56fb7811cc9505.tar.gz cpython-eca7172c3c263affcdb881272b56fb7811cc9505.tar.bz2 |
merge 3.5
-rw-r--r-- | Modules/_hashopenssl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c index a157fbb..8ccc243 100644 --- a/Modules/_hashopenssl.c +++ b/Modules/_hashopenssl.c @@ -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; |