diff options
| author | Steven Fackler <[email protected]> | 2017-09-17 13:57:18 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-09-17 13:57:18 -0700 |
| commit | f0db1dbc958d57d61c6bd33811a289a3ed705c13 (patch) | |
| tree | 39eed5e4cd860663df49ff784260941059790d26 /openssl/src/ssl/mod.rs | |
| parent | Update default client cipher list (diff) | |
| parent | openssl: ecdh_tmp_callback doesn't work with libressl 2.6.1 (diff) | |
| download | rust-openssl-f0db1dbc958d57d61c6bd33811a289a3ed705c13.tar.xz rust-openssl-f0db1dbc958d57d61c6bd33811a289a3ed705c13.zip | |
Merge pull request #695 from Keruspe/master
openssl-sys: support libressl 2.6.1
Diffstat (limited to 'openssl/src/ssl/mod.rs')
| -rw-r--r-- | openssl/src/ssl/mod.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/openssl/src/ssl/mod.rs b/openssl/src/ssl/mod.rs index dc0f5448..762118a5 100644 --- a/openssl/src/ssl/mod.rs +++ b/openssl/src/ssl/mod.rs @@ -652,6 +652,7 @@ impl SslContextBuilder { /// Set the protocols to be used during Next Protocol Negotiation (the protocols /// supported by the application). + #[cfg(not(libressl261))] 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. @@ -1310,6 +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))] pub fn selected_npn_protocol(&self) -> Option<&[u8]> { unsafe { let mut data: *const c_uchar = ptr::null(); |