aboutsummaryrefslogtreecommitdiff
path: root/openssl/src/ssl/mod.rs
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2017-11-13 08:53:35 -0800
committerGitHub <[email protected]>2017-11-13 08:53:35 -0800
commitb91aed22c6f2364cd2c8df7d2dbf9bb8ce5152bc (patch)
treed3f3b44b18e8b23a5947772f8fb10d503c735acb /openssl/src/ssl/mod.rs
parentMerge pull request #773 from gbip/master (diff)
parentUpdate CI to use LibreSSL 2.6.3 (diff)
downloadrust-openssl-b91aed22c6f2364cd2c8df7d2dbf9bb8ce5152bc.tar.xz
rust-openssl-b91aed22c6f2364cd2c8df7d2dbf9bb8ce5152bc.zip
Merge pull request #759 from feeeeb/libressl-v2.6.3
Libressl v2.6.3
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 d3a5e428..6bba8635 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)))]
+ #[cfg(not(any(libressl261, libressl262, libressl263)))]
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)))]
+ #[cfg(not(any(libressl261, libressl262, libressl263)))]
pub fn selected_npn_protocol(&self) -> Option<&[u8]> {
unsafe {
let mut data: *const c_uchar = ptr::null();