aboutsummaryrefslogtreecommitdiff
path: root/openssl/src/ssl/callbacks.rs
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2018-02-14 22:04:29 -0800
committerSteven Fackler <[email protected]>2018-02-14 22:11:24 -0800
commitf4ddd66b0314fa6d5f8eda9d1a13167612376c81 (patch)
tree7fae739c5340afb3ce177f782f8b9c5c8c104283 /openssl/src/ssl/callbacks.rs
parentSet ossl110 when version is 1.1.1 (diff)
downloadrust-openssl-f4ddd66b0314fa6d5f8eda9d1a13167612376c81.tar.xz
rust-openssl-f4ddd66b0314fa6d5f8eda9d1a13167612376c81.zip
Tweak features
We should keep the version features totally separate for now.
Diffstat (limited to 'openssl/src/ssl/callbacks.rs')
-rw-r--r--openssl/src/ssl/callbacks.rs6
1 files changed, 4 insertions, 2 deletions
diff --git a/openssl/src/ssl/callbacks.rs b/openssl/src/ssl/callbacks.rs
index 7d884b4e..9a3d3de1 100644
--- a/openssl/src/ssl/callbacks.rs
+++ b/openssl/src/ssl/callbacks.rs
@@ -12,7 +12,8 @@ use dh::Dh;
use ec::EcKey;
use pkey::Params;
use ssl::{get_callback_idx, get_ssl_callback_idx, SniError, SslAlert, SslRef};
-#[cfg(any(all(feature = "v102", ossl102), all(feature = "v110", ossl110)))]
+#[cfg(any(all(feature = "v102", ossl102), all(feature = "v110", ossl110),
+ all(feature = "v111", ossl111)))]
use ssl::AlpnError;
use x509::X509StoreContextRef;
@@ -107,7 +108,8 @@ where
}
}
-#[cfg(any(all(feature = "v102", ossl102), all(feature = "v110", ossl110)))]
+#[cfg(any(all(feature = "v102", ossl102), all(feature = "v110", ossl110),
+ all(feature = "v111", ossl111)))]
pub extern "C" fn raw_alpn_select<F>(
ssl: *mut ffi::SSL,
out: *mut *const c_uchar,