diff options
| author | Steven Fackler <[email protected]> | 2018-04-27 13:29:04 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-04-27 13:29:04 -0700 |
| commit | f90e00500c2c15aa6697e42ef2936e639d6024a2 (patch) | |
| tree | d77e44a614052e7a2665dfc0105a8f4d483433f6 /openssl-sys/src/libressl/mod.rs | |
| parent | Remove Rsa::build (diff) | |
| parent | Reform version checking logic (diff) | |
| download | rust-openssl-f90e00500c2c15aa6697e42ef2936e639d6024a2.tar.xz rust-openssl-f90e00500c2c15aa6697e42ef2936e639d6024a2.zip | |
Merge pull request #904 from sfackler/version-number
Reform version checking logic
Diffstat (limited to 'openssl-sys/src/libressl/mod.rs')
| -rw-r--r-- | openssl-sys/src/libressl/mod.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/openssl-sys/src/libressl/mod.rs b/openssl-sys/src/libressl/mod.rs index 0bcf83e1..366d9502 100644 --- a/openssl-sys/src/libressl/mod.rs +++ b/openssl-sys/src/libressl/mod.rs @@ -1,7 +1,7 @@ -use std::sync::{Mutex, MutexGuard}; -use std::sync::{Once, ONCE_INIT}; use std::mem; use std::ptr; +use std::sync::{Mutex, MutexGuard}; +use std::sync::{Once, ONCE_INIT}; #[cfg(libressl250)] pub use libressl::v250::*; @@ -337,9 +337,9 @@ pub const SSL_CTRL_OPTIONS: c_int = 32; pub const SSL_CTRL_CLEAR_OPTIONS: c_int = 77; pub const SSL_CTRL_SET_ECDH_AUTO: c_int = 94; -#[cfg(any(libressl261, libressl262, libressl26x, libressl27))] +#[cfg(any(libressl261, libressl262, libressl26x, libressl27x))] pub const SSL_OP_ALL: c_ulong = 0x4; -#[cfg(not(any(libressl261, libressl262, libressl26x, libressl27)))] +#[cfg(not(any(libressl261, libressl262, libressl26x, libressl27x)))] pub const SSL_OP_ALL: c_ulong = 0x80000014; pub const SSL_OP_CISCO_ANYCONNECT: c_ulong = 0x0; pub const SSL_OP_NO_COMPRESSION: c_ulong = 0x0; @@ -352,9 +352,9 @@ pub const SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER: c_ulong = 0x0; pub const SSL_OP_SSLEAY_080_CLIENT_DH_BUG: c_ulong = 0x0; pub const SSL_OP_TLS_D5_BUG: c_ulong = 0x0; pub const SSL_OP_TLS_BLOCK_PADDING_BUG: c_ulong = 0x0; -#[cfg(any(libressl261, libressl262, libressl26x, libressl27))] +#[cfg(any(libressl261, libressl262, libressl26x, libressl27x))] pub const SSL_OP_SINGLE_ECDH_USE: c_ulong = 0x0; -#[cfg(not(any(libressl261, libressl262, libressl26x, libressl27)))] +#[cfg(not(any(libressl261, libressl262, libressl26x, libressl27x)))] pub const SSL_OP_SINGLE_ECDH_USE: c_ulong = 0x00080000; pub const SSL_OP_SINGLE_DH_USE: c_ulong = 0x00100000; pub const SSL_OP_NO_SSLv2: c_ulong = 0x0; |