diff options
| author | Benjamin Peterson <benjamin@python.org> | 2015-09-27 09:14:23 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2015-09-27 09:14:23 (GMT) |
| commit | a18bd0e0f0dc4ad8dd52c4c39fec730dbd283cc5 (patch) | |
| tree | 2c11989e7659cdbc2ba2e5a99d265bf583a69d91 | |
| parent | 667422dd563e4d639bfed8b32d9b143e249ec6d7 (diff) | |
| parent | 3c0769d47805d2f0c0550c85a709b6a4ce817fa9 (diff) | |
| download | cpython-a18bd0e0f0dc4ad8dd52c4c39fec730dbd283cc5.zip cpython-a18bd0e0f0dc4ad8dd52c4c39fec730dbd283cc5.tar.gz cpython-a18bd0e0f0dc4ad8dd52c4c39fec730dbd283cc5.tar.bz2 | |
merge 3.4
| -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; |