aboutsummaryrefslogtreecommitdiff
path: root/openssl-sys/src/libressl/mod.rs
diff options
context:
space:
mode:
authorAndy Gauge <[email protected]>2017-10-09 12:10:04 -0700
committerAndy Gauge <[email protected]>2017-10-09 12:10:04 -0700
commit2c7f0e7604e758d2ba7f6f39ab78d8302f484f65 (patch)
treeb939ebd1ac58177ad4e7a8f25b488f8fe41cd61f /openssl-sys/src/libressl/mod.rs
parentBegun DSA documentation (diff)
parentMerge pull request #753 from zsck/issue719 (diff)
downloadrust-openssl-2c7f0e7604e758d2ba7f6f39ab78d8302f484f65.tar.xz
rust-openssl-2c7f0e7604e758d2ba7f6f39ab78d8302f484f65.zip
Merge branch 'master' of https://github.com/sfackler/rust-openssl
Diffstat (limited to 'openssl-sys/src/libressl/mod.rs')
-rw-r--r--openssl-sys/src/libressl/mod.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/openssl-sys/src/libressl/mod.rs b/openssl-sys/src/libressl/mod.rs
index f4806e8a..52a76f9e 100644
--- a/openssl-sys/src/libressl/mod.rs
+++ b/openssl-sys/src/libressl/mod.rs
@@ -345,9 +345,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(libressl261)]
+#[cfg(any(libressl261, libressl262))]
pub const SSL_OP_ALL: c_ulong = 0x4;
-#[cfg(not(libressl261))]
+#[cfg(not(any(libressl261, libressl262)))]
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;
@@ -360,9 +360,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(libressl261)]
+#[cfg(any(libressl261, libressl262))]
pub const SSL_OP_SINGLE_ECDH_USE: c_ulong = 0x0;
-#[cfg(not(libressl261))]
+#[cfg(not(any(libressl261, libressl262)))]
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;