diff options
| author | Steven Fackler <[email protected]> | 2017-10-03 22:11:29 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-10-03 22:11:29 -0700 |
| commit | ff8f54812c0f3bc9a2137cbf9d1df89cd080c891 (patch) | |
| tree | 90d713904aab0cbdf02254f85fc3e197290c16cc /openssl/src/ssl/mod.rs | |
| parent | Merge pull request #750 from johnthagen/remove-try (diff) | |
| parent | Fix cfgs for libressl262 (diff) | |
| download | rust-openssl-ff8f54812c0f3bc9a2137cbf9d1df89cd080c891.tar.xz rust-openssl-ff8f54812c0f3bc9a2137cbf9d1df89cd080c891.zip | |
Merge pull request #752 from chrisvittal/libressl262
Add support for LibreSSL 2.6.2
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 972d583e..01b49cb8 100644 --- a/openssl/src/ssl/mod.rs +++ b/openssl/src/ssl/mod.rs @@ -652,7 +652,7 @@ impl SslContextBuilder { /// Set the protocols to be used during Next Protocol Negotiation (the protocols /// supported by the application). - #[cfg(not(libressl261))] + #[cfg(not(any(libressl261, libressl262)))] 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. @@ -1311,7 +1311,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(libressl261))] + #[cfg(not(any(libressl261, libressl262)))] pub fn selected_npn_protocol(&self) -> Option<&[u8]> { unsafe { let mut data: *const c_uchar = ptr::null(); |