diff options
| author | Steven Fackler <[email protected]> | 2017-11-14 11:35:57 -0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-11-14 11:35:57 -0800 |
| commit | ca0c828d72d4d3edf556cc393d35f548762e6ae6 (patch) | |
| tree | 99fb67da55cad2d3c80cdce1bcb6419960923987 /openssl/src/ssl/mod.rs | |
| parent | Merge pull request #759 from feeeeb/libressl-v2.6.3 (diff) | |
| parent | Adjust libressl version detection (diff) | |
| download | rust-openssl-ca0c828d72d4d3edf556cc393d35f548762e6ae6.tar.xz rust-openssl-ca0c828d72d4d3edf556cc393d35f548762e6ae6.zip | |
Merge pull request #775 from sfackler/libressl-stable
Whitelist stable libressl version ranges
Diffstat (limited to 'openssl/src/ssl/mod.rs')
| -rw-r--r-- | openssl/src/ssl/mod.rs | 4 |
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(); |