diff options
| author | Steven Fackler <[email protected]> | 2018-06-21 13:41:06 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-06-21 13:41:06 -0700 |
| commit | 19430b114ea1a39e927c169186afdc25e487b62a (patch) | |
| tree | 4b26f2e3425cfccccc4beea03dbfe273fc1b9a72 /openssl/src | |
| parent | Merge pull request #943 from lolzballs/master (diff) | |
| parent | Fix build with openssl 1.1.1 and no-psk (diff) | |
| download | rust-openssl-19430b114ea1a39e927c169186afdc25e487b62a.tar.xz rust-openssl-19430b114ea1a39e927c169186afdc25e487b62a.zip | |
Merge pull request #952 from rumpelsepp/patch-1
Fix build with openssl 1.1.1 and no-psk
Diffstat (limited to 'openssl/src')
| -rw-r--r-- | openssl/src/ssl/callbacks.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/openssl/src/ssl/callbacks.rs b/openssl/src/ssl/callbacks.rs index f45146c6..f9a5aa09 100644 --- a/openssl/src/ssl/callbacks.rs +++ b/openssl/src/ssl/callbacks.rs @@ -1,12 +1,12 @@ use ffi; use foreign_types::ForeignType; use foreign_types::ForeignTypeRef; -#[cfg(not(osslconf = "OPENSSL_NO_PSK"))] +#[cfg(any(ossl111, not(osslconf = "OPENSSL_NO_PSK")))] use libc::c_char; #[cfg(ossl111)] use libc::size_t; use libc::{c_int, c_uchar, c_uint, c_void}; -#[cfg(not(osslconf = "OPENSSL_NO_PSK"))] +#[cfg(any(ossl111, not(osslconf = "OPENSSL_NO_PSK")))] use std::ffi::CStr; use std::mem; use std::ptr; |