Skip to content

C
cpython
Kaydet (Commit) cc6cdce7 authored tarafından Christian Heimes's avatar Christian Heimes
Dosyalara gözat
Seçenekler

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

üst 7f4bf9fb
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 5 deletions
Modules/_hashopenssl.c
Dosyayı görüntüle @ cc6cdce7
...@@ -504,10 +504,6 @@ PKCS5_PBKDF2_HMAC_fast(const char *pass, int passlen, ...@@ -504,10 +504,6 @@ PKCS5_PBKDF2_HMAC_fast(const char *pass, int passlen,
HMAC_CTX_init(&hctx); HMAC_CTX_init(&hctx);
p = out; p = out;
tkeylen = keylen; tkeylen = keylen;
if (!pass)
passlen = 0;
else if(passlen == -1)
passlen = strlen(pass);
if (!HMAC_Init_ex(&hctx_tpl, pass, passlen, digest, NULL)) { if (!HMAC_Init_ex(&hctx_tpl, pass, passlen, digest, NULL)) {
HMAC_CTX_cleanup(&hctx_tpl); HMAC_CTX_cleanup(&hctx_tpl);
return 0; return 0;
...@@ -671,7 +667,7 @@ pbkdf2_hmac(PyObject *self, PyObject *args, PyObject *kwdict) ...@@ -671,7 +667,7 @@ pbkdf2_hmac(PyObject *self, PyObject *args, PyObject *kwdict)
Py_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS
retval = PKCS5_PBKDF2_HMAC_fast((char*)password.buf, (int)password.len, 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, iterations, digest, dklen,
(unsigned char *)key); (unsigned char *)key);
Py_END_ALLOW_THREADS Py_END_ALLOW_THREADS
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment