diff options
| author | Christian Heimes <christian@python.org> | 2019-09-12 13:46:37 +0200 |
|---|---|---|
| committer | Gregory P. Smith <greg@krypto.org> | 2019-09-12 12:46:37 +0100 |
| commit | 64117e059b79236c7345bc9afc1cc707162411de (patch) | |
| tree | 55ca7cd5a1573ac64c39f4ae8158dcf5a78e63f8 /Modules/clinic | |
| parent | 31a82e25b6044a5b5ee25246bad3eb7b873cf5ec (diff) | |
| download | cpython-git-64117e059b79236c7345bc9afc1cc707162411de.tar.gz | |
bpo-38134: Remove PKBDF2_HMAC_fast from _hashopenssl (GH-16028)
Signed-off-by: Christian Heimes <christian@python.org>
Diffstat (limited to 'Modules/clinic')
| -rw-r--r-- | Modules/clinic/_hashopenssl.c.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/Modules/clinic/_hashopenssl.c.h b/Modules/clinic/_hashopenssl.c.h index 6377e18ece..854d925377 100644 --- a/Modules/clinic/_hashopenssl.c.h +++ b/Modules/clinic/_hashopenssl.c.h @@ -109,8 +109,6 @@ exit: return return_value; } -#if ((OPENSSL_VERSION_NUMBER >= 0x10000000 && !defined(OPENSSL_NO_HMAC) && !defined(OPENSSL_NO_SHA))) - PyDoc_STRVAR(pbkdf2_hmac__doc__, "pbkdf2_hmac($module, /, hash_name, password, salt, iterations,\n" " dklen=None)\n" @@ -200,8 +198,6 @@ exit: return return_value; } -#endif /* ((OPENSSL_VERSION_NUMBER >= 0x10000000 && !defined(OPENSSL_NO_HMAC) && !defined(OPENSSL_NO_SHA))) */ - #if (OPENSSL_VERSION_NUMBER > 0x10100000L && !defined(OPENSSL_NO_SCRYPT) && !defined(LIBRESSL_VERSION_NUMBER)) PyDoc_STRVAR(_hashlib_scrypt__doc__, @@ -402,11 +398,7 @@ exit: return return_value; } -#ifndef PBKDF2_HMAC_METHODDEF - #define PBKDF2_HMAC_METHODDEF -#endif /* !defined(PBKDF2_HMAC_METHODDEF) */ - #ifndef _HASHLIB_SCRYPT_METHODDEF #define _HASHLIB_SCRYPT_METHODDEF #endif /* !defined(_HASHLIB_SCRYPT_METHODDEF) */ -/*[clinic end generated code: output=565dcbe3452e71f4 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=cfe686cb2fa042e1 input=a9049054013a1b77]*/ |