diff options
| author | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2016-04-08 23:19:22 +0200 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-04-08 17:19:22 -0400 |
| commit | 97511e5b8d8169096b48ff73ecce7d973129cf87 (patch) | |
| tree | d1d585a57f2b96ab6b98007d0e6b41d30b8e3e60 /src/cryptography/hazmat/bindings/openssl/_conditional.py | |
| parent | d824f6005a8520e3b98fb349a899c33f300b7a08 (diff) | |
| download | cryptography-97511e5b8d8169096b48ff73ecce7d973129cf87.tar.gz cryptography-97511e5b8d8169096b48ff73ecce7d973129cf87.tar.bz2 cryptography-97511e5b8d8169096b48ff73ecce7d973129cf87.zip | |
Add more bindings to OpenSSL, to be used by the Python _ssl module. (#2868)
* Add more bindings to OpenSSL, all are used by the Python _ssl module.
* Add a conditional: SSL_CTX_clear_options() does not exist before 0.9.8m
* 80 cols
* Condionally define the TLSEXT error codes.
* Address review comments
* Remove all parameter names
Diffstat (limited to 'src/cryptography/hazmat/bindings/openssl/_conditional.py')
| -rw-r--r-- | src/cryptography/hazmat/bindings/openssl/_conditional.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/cryptography/hazmat/bindings/openssl/_conditional.py b/src/cryptography/hazmat/bindings/openssl/_conditional.py index 5a69af5e..6851b97f 100644 --- a/src/cryptography/hazmat/bindings/openssl/_conditional.py +++ b/src/cryptography/hazmat/bindings/openssl/_conditional.py @@ -204,6 +204,12 @@ CONDITIONAL_NAMES = { "EC_R_UNKNOWN_GROUP", "EC_F_EC_GROUP_NEW_BY_CURVE_NAME" ], + "Cryptography_HAS_TLSEXT_ERROR_CODES": [ + "SSL_TLSEXT_ERR_OK", + "SSL_TLSEXT_ERR_ALERT_WARNING", + "SSL_TLSEXT_ERR_ALERT_FATAL", + "SSL_TLSEXT_ERR_NOACK", + ], "Cryptography_HAS_RSA_R_PKCS_DECODING_ERROR": [ "RSA_R_PKCS_DECODING_ERROR" ], @@ -351,6 +357,9 @@ CONDITIONAL_NAMES = { "Cryptography_HAS_SSL_CTX_SET_CLIENT_CERT_ENGINE": [ "SSL_CTX_set_client_cert_engine", ], + "Cryptography_HAS_SSL_CTX_CLEAR_OPTIONS": [ + "SSL_CTX_clear_options", + ], "Cryptography_HAS_102_VERIFICATION_ERROR_CODES": [ 'X509_V_ERR_SUITE_B_INVALID_VERSION', 'X509_V_ERR_SUITE_B_INVALID_ALGORITHM', |