aboutsummaryrefslogtreecommitdiff
path: root/openssl/src/ssl/mod.rs
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2017-11-13 21:51:55 -0800
committerSteven Fackler <[email protected]>2017-11-13 21:51:55 -0800
commit55bf390dbea0914a128f1e4d2f3808420da3be87 (patch)
tree99fb67da55cad2d3c80cdce1bcb6419960923987 /openssl/src/ssl/mod.rs
parentRemove libressl 2.6.2 build (diff)
downloadrust-openssl-55bf390dbea0914a128f1e4d2f3808420da3be87.tar.xz
rust-openssl-55bf390dbea0914a128f1e4d2f3808420da3be87.zip
Adjust libressl version detection
The 2.5.3+ and 2.6.3+ series are ABI-stable, so we don't need to whitelist individual releases in those ranges.
Diffstat (limited to 'openssl/src/ssl/mod.rs')
-rw-r--r--openssl/src/ssl/mod.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/openssl/src/ssl/mod.rs b/openssl/src/ssl/mod.rs
index 6bba8635..176863d6 100644
--- a/openssl/src/ssl/mod.rs
+++ b/openssl/src/ssl/mod.rs
@@ -649,7 +649,7 @@ impl SslContextBuilder {
/// Set the protocols to be used during Next Protocol Negotiation (the protocols
/// supported by the application).
- #[cfg(not(any(libressl261, libressl262, libressl263)))]
+ #[cfg(not(any(libressl261, libressl262, libressl26x)))]
pub fn set_npn_protocols(&mut self, protocols: &[&[u8]]) -> Result<(), ErrorStack> {
// Firstly, convert the list of protocols to a byte-array that can be passed to OpenSSL
// APIs -- a list of length-prefixed strings.
@@ -1307,7 +1307,7 @@ impl SslRef {
///
/// The protocol's name is returned is an opaque sequence of bytes. It is up to the client
/// to interpret it.
- #[cfg(not(any(libressl261, libressl262, libressl263)))]
+ #[cfg(not(any(libressl261, libressl262, libressl26x)))]
pub fn selected_npn_protocol(&self) -> Option<&[u8]> {
unsafe {
let mut data: *const c_uchar = ptr::null();