diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-04-17 09:30:20 -0500 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-04-17 09:30:20 -0500 |
| commit | 97a49a3135d37209a3cbd061525351275434adcc (patch) | |
| tree | 3622027e9f966f5987ffc51a725e2c432acb420e | |
| parent | b4e6d5023962a194e82bb3ee80e9042c6439db62 (diff) | |
| parent | 622409947f6e64fcabbf2b4da2ed086abc06ed85 (diff) | |
| download | cryptography-97a49a3135d37209a3cbd061525351275434adcc.tar.gz cryptography-97a49a3135d37209a3cbd061525351275434adcc.tar.bz2 cryptography-97a49a3135d37209a3cbd061525351275434adcc.zip | |
Merge pull request #1849 from Sp1l/master
LibreSSL added ALPN support in 2.1.3
| -rw-r--r-- | src/cryptography/hazmat/bindings/openssl/ssl.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cryptography/hazmat/bindings/openssl/ssl.py b/src/cryptography/hazmat/bindings/openssl/ssl.py index d680c3a5..6161a9d1 100644 --- a/src/cryptography/hazmat/bindings/openssl/ssl.py +++ b/src/cryptography/hazmat/bindings/openssl/ssl.py @@ -526,7 +526,7 @@ static const long Cryptography_HAS_NEXTPROTONEG = 1; #endif /* ALPN was added in OpenSSL 1.0.2. */ -#if OPENSSL_VERSION_NUMBER < 0x10002001L +#if OPENSSL_VERSION_NUMBER < 0x10002001L && !defined(LIBRESSL_VERSION_NUMBER) int (*SSL_CTX_set_alpn_protos)(SSL_CTX *, const unsigned char *, unsigned) = NULL; |