diff options
| author | Steven Fackler <[email protected]> | 2017-09-17 13:57:18 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-09-17 13:57:18 -0700 |
| commit | f0db1dbc958d57d61c6bd33811a289a3ed705c13 (patch) | |
| tree | 39eed5e4cd860663df49ff784260941059790d26 /openssl-sys/src/lib.rs | |
| parent | Update default client cipher list (diff) | |
| parent | openssl: ecdh_tmp_callback doesn't work with libressl 2.6.1 (diff) | |
| download | rust-openssl-f0db1dbc958d57d61c6bd33811a289a3ed705c13.tar.xz rust-openssl-f0db1dbc958d57d61c6bd33811a289a3ed705c13.zip | |
Merge pull request #695 from Keruspe/master
openssl-sys: support libressl 2.6.1
Diffstat (limited to 'openssl-sys/src/lib.rs')
| -rw-r--r-- | openssl-sys/src/lib.rs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs index 48d07b4a..81145432 100644 --- a/openssl-sys/src/lib.rs +++ b/openssl-sys/src/lib.rs @@ -1250,10 +1250,15 @@ pub const SSL_VERIFY_NONE: c_int = 0; pub const SSL_VERIFY_PEER: c_int = 1; pub const SSL_VERIFY_FAIL_IF_NO_PEER_CERT: c_int = 2; -#[cfg(not(ossl101))] +#[cfg(not(any(libressl261, ossl101)))] pub const SSL_OP_TLSEXT_PADDING: c_ulong = 0x00000010; +#[cfg(libressl261)] +pub const SSL_OP_TLSEXT_PADDING: c_ulong = 0x0; pub const SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS: c_ulong = 0x00000800; +#[cfg(not(libressl261))] pub const SSL_OP_CRYPTOPRO_TLSEXT_BUG: c_ulong = 0x80000000; +#[cfg(libressl261)] +pub const SSL_OP_CRYPTOPRO_TLSEXT_BUG: c_ulong = 0x0; pub const SSL_OP_LEGACY_SERVER_CONNECT: c_ulong = 0x00000004; #[cfg(not(libressl))] pub const SSL_OP_SAFARI_ECDHE_ECDSA_BUG: c_ulong = 0x00000040; |