From: Christian Heimes <christian@cheimes.de>
Date: Mon, 18 Nov 2013 08:59:44 +0000 (+0100)
Subject: Remove unused code path from PBKDF2 that is causing a warning on Win64
X-Git-Tag: v3.4.0b1~202
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cc6cdce75095e99444492b2ed63e26c63c776128;p=thirdparty%2FPython%2Fcpython.git

Remove unused code path from PBKDF2 that is causing a warning on Win64
---

diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c
index b4c5b511ee64..a866fbf7f95d 100644
--- a/Modules/_hashopenssl.c
+++ b/Modules/_hashopenssl.c
@@ -504,10 +504,6 @@ PKCS5_PBKDF2_HMAC_fast(const char *pass, int passlen,
     HMAC_CTX_init(&hctx);
     p = out;
     tkeylen = keylen;
-    if (!pass)
-        passlen = 0;
-    else if(passlen == -1)
-        passlen = strlen(pass);
     if (!HMAC_Init_ex(&hctx_tpl, pass, passlen, digest, NULL)) {
         HMAC_CTX_cleanup(&hctx_tpl);
         return 0;
@@ -671,7 +667,7 @@ pbkdf2_hmac(PyObject *self, PyObject *args, PyObject *kwdict)
 
     Py_BEGIN_ALLOW_THREADS
     retval = PKCS5_PBKDF2_HMAC_fast((char*)password.buf, (int)password.len,
-                                    (unsigned char *)salt.buf, salt.len,
+                                    (unsigned char *)salt.buf, (int)salt.len,
                                     iterations, digest, dklen,
                                     (unsigned char *)key);
     Py_END_ALLOW_THREADS