diff options
| author | Steven Fackler <[email protected]> | 2018-04-26 22:45:09 -0700 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2018-04-26 22:45:09 -0700 |
| commit | 03a4c6bd26f70f37c79e594a86a0388b880ca998 (patch) | |
| tree | d77e44a614052e7a2665dfc0105a8f4d483433f6 /openssl-sys/src/lib.rs | |
| parent | Remove Rsa::build (diff) | |
| download | rust-openssl-03a4c6bd26f70f37c79e594a86a0388b880ca998.tar.xz rust-openssl-03a4c6bd26f70f37c79e594a86a0388b880ca998.zip | |
Reform version checking logic
Rather than having an infinitely growing set of things to look for, just
grab the literal version out. We also provide that to downstream crates,
and it should be used rather than the random assortment of other stuff
that's also passed down.
Diffstat (limited to 'openssl-sys/src/lib.rs')
| -rw-r--r-- | openssl-sys/src/lib.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs index 03ab60f4..8ebcb187 100644 --- a/openssl-sys/src/lib.rs +++ b/openssl-sys/src/lib.rs @@ -5,8 +5,8 @@ extern crate libc; use libc::{c_char, c_int, c_long, c_uchar, c_uint, c_ulong, c_void, size_t, FILE}; -use std::ptr; use std::mem; +use std::ptr; #[cfg(any(ossl101, ossl102))] mod ossl10x; @@ -1277,14 +1277,14 @@ 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(any(libressl261, libressl262, libressl26x, libressl27, ossl101)))] +#[cfg(not(any(libressl261, libressl262, libressl26x, libressl27x, ossl101)))] pub const SSL_OP_TLSEXT_PADDING: c_ulong = 0x00000010; -#[cfg(any(libressl261, libressl262, libressl26x, libressl27))] +#[cfg(any(libressl261, libressl262, libressl26x, libressl27x))] pub const SSL_OP_TLSEXT_PADDING: c_ulong = 0x0; pub const SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS: c_ulong = 0x00000800; -#[cfg(not(any(libressl261, libressl262, libressl26x, libressl27)))] +#[cfg(not(any(libressl261, libressl262, libressl26x, libressl27x)))] pub const SSL_OP_CRYPTOPRO_TLSEXT_BUG: c_ulong = 0x80000000; -#[cfg(any(libressl261, libressl262, libressl26x, libressl27))] +#[cfg(any(libressl261, libressl262, libressl26x, libressl27x))] pub const SSL_OP_CRYPTOPRO_TLSEXT_BUG: c_ulong = 0x0; pub const SSL_OP_LEGACY_SERVER_CONNECT: c_ulong = 0x00000004; #[cfg(not(libressl))] |