diff options
| author | Steven Fackler <[email protected]> | 2018-05-20 12:52:49 -0700 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2018-05-20 12:52:49 -0700 |
| commit | 4c1fdf1d81e20ee2130e883bb9065af0d1d4de2a (patch) | |
| tree | 8d3f01193654f99bb132514577c8447a8fdb15a1 /openssl/src/ssl/callbacks.rs | |
| parent | Merge pull request #923 from sfackler/libressl-hostname (diff) | |
| download | rust-openssl-4c1fdf1d81e20ee2130e883bb9065af0d1d4de2a.tar.xz rust-openssl-4c1fdf1d81e20ee2130e883bb9065af0d1d4de2a.zip | |
Support ALPN on libressl
Closes #690
Diffstat (limited to 'openssl/src/ssl/callbacks.rs')
| -rw-r--r-- | openssl/src/ssl/callbacks.rs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/openssl/src/ssl/callbacks.rs b/openssl/src/ssl/callbacks.rs index 6ec9aef9..b23c60e7 100644 --- a/openssl/src/ssl/callbacks.rs +++ b/openssl/src/ssl/callbacks.rs @@ -1,9 +1,12 @@ use ffi; use foreign_types::ForeignType; use foreign_types::ForeignTypeRef; +#[cfg(not(osslconf = "OPENSSL_NO_PSK"))] +use libc::c_char; #[cfg(ossl111)] use libc::size_t; -use libc::{c_char, c_int, c_uchar, c_uint, c_void}; +use libc::{c_int, c_uchar, c_uint, c_void}; +#[cfg(not(osslconf = "OPENSSL_NO_PSK"))] use std::ffi::CStr; use std::mem; use std::ptr; @@ -17,7 +20,7 @@ use dh::Dh; use ec::EcKey; use error::ErrorStack; use pkey::Params; -#[cfg(ossl102)] +#[cfg(any(ossl102, libressl261))] use ssl::AlpnError; #[cfg(ossl111)] use ssl::ExtensionContext; @@ -130,7 +133,7 @@ where } } -#[cfg(any(ossl102, ossl110))] +#[cfg(any(ossl102, libressl261))] pub extern "C" fn raw_alpn_select<F>( ssl: *mut ffi::SSL, out: *mut *const c_uchar, |