diff options
author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-12-19 17:25:00 -0600 |
---|---|---|
committer | Alex Gaynor <alex.gaynor@gmail.com> | 2016-12-19 18:25:00 -0500 |
commit | e432562e771f7e190310a093e93a217871e35c90 (patch) | |
tree | cf4153cfee886a6229f8bf511130ebead8620f42 /src/cryptography/hazmat/bindings/openssl/_conditional.py | |
parent | 7a15827ee65ef0b2ccab8615eba512913c92c4b5 (diff) | |
download | cryptography-e432562e771f7e190310a093e93a217871e35c90.tar.gz cryptography-e432562e771f7e190310a093e93a217871e35c90.tar.bz2 cryptography-e432562e771f7e190310a093e93a217871e35c90.zip |
DTLS bindings (#3309)
* add DTLSv1_2 methods
* add binding to DTLSv1_get_timeout() and DTLSv1_handle_timeout()
* fix: PEP8 failed
fix the following error:
./src/_cffi_src/openssl/ssl.py:728:80: E501 line too long (80 > 79 characters)
see https://jenkins.cryptography.io/job/cryptography-pr-pep8/1954/
* Revert "add DTLSv1_2 methods"
This reverts commit e4a9150b12ddb4790159a5835f1d1136cb1b996e.
* replace 'long int' by 'long'
To be more consistent with the naming convention
cf https://github.com/pyca/cryptography/pull/3286/files/8dde92aad5db97fa176bf164783bdf9ba242edf4#r90153970
* wrap with braces
cf https://github.com/pyca/cryptography/pull/3286/files/8dde92aad5db97fa176bf164783bdf9ba242edf4#r90154057
* conditionally bind all DTLS
* rebase error
* rename wrapped function
Diffstat (limited to 'src/cryptography/hazmat/bindings/openssl/_conditional.py')
-rw-r--r-- | src/cryptography/hazmat/bindings/openssl/_conditional.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/cryptography/hazmat/bindings/openssl/_conditional.py b/src/cryptography/hazmat/bindings/openssl/_conditional.py index 46c32d14..291cea8c 100644 --- a/src/cryptography/hazmat/bindings/openssl/_conditional.py +++ b/src/cryptography/hazmat/bindings/openssl/_conditional.py @@ -303,4 +303,8 @@ CONDITIONAL_NAMES = { "Cryptography_HAS_SCRYPT": [ "EVP_PBE_scrypt", ], + "Cryptography_HAS_DTLS": [ + "Cryptography_DTLSv1_get_timeout", + "DTLSv1_handle_timeout", + ], } |