diff options
| author | Terry Chia <terrycwk1994@gmail.com> | 2016-08-27 16:25:54 +0800 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-08-27 16:25:54 +0800 |
| commit | d6871fe568983b46a3b688c3222289357a7f56cd (patch) | |
| tree | fe83e9959dfd04cee6633e703c8e96a069d133f8 /src/cryptography/hazmat/bindings/openssl/_conditional.py | |
| parent | 3b83fc21eb1abe1b53efe5f6920885676158be5c (diff) | |
| download | cryptography-d6871fe568983b46a3b688c3222289357a7f56cd.tar.gz cryptography-d6871fe568983b46a3b688c3222289357a7f56cd.tar.bz2 cryptography-d6871fe568983b46a3b688c3222289357a7f56cd.zip | |
Scrypt bindings (#3114)
* Add Scrypt bindings.
* Add check for OPENSSL_NO_SCRYPT.
* Fix CUSTOMIZATIONS.
* Account for LibreSSL.
* Remove argument names.
* Remove more argument names.
Diffstat (limited to 'src/cryptography/hazmat/bindings/openssl/_conditional.py')
| -rw-r--r-- | src/cryptography/hazmat/bindings/openssl/_conditional.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/cryptography/hazmat/bindings/openssl/_conditional.py b/src/cryptography/hazmat/bindings/openssl/_conditional.py index 9d1fced3..4da09870 100644 --- a/src/cryptography/hazmat/bindings/openssl/_conditional.py +++ b/src/cryptography/hazmat/bindings/openssl/_conditional.py @@ -312,5 +312,8 @@ CONDITIONAL_NAMES = { "CRYPTO_READ", "CRYPTO_LOCK_SSL", "CRYPTO_lock", + ], + "Cryptography_HAS_SCRYPT": [ + "EVP_PBE_scrypt", ] } |