merge 3.4

a18bd0e0 · Benjamin Peterson · 667422dd · 3c0769d4 · a18bd0e0
Kaydet (Commit) a18bd0e0 authored Eyl 27, 2015 tarafından Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

_hashopenssl.c Modules/_hashopenssl.c +2 -2

No files found.
--- 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;