diff options
| author | Steven Fackler <[email protected]> | 2017-07-15 17:25:02 -0700 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2017-07-15 17:25:02 -0700 |
| commit | dbbf446a9e7fa1862e05d475a96e2bf59028c33d (patch) | |
| tree | a972a946b2e9ef0babd28967a24e03fc0c97573f /openssl/src | |
| parent | Don't overwrite the configured verify mode (diff) | |
| download | rust-openssl-dbbf446a9e7fa1862e05d475a96e2bf59028c33d.tar.xz rust-openssl-dbbf446a9e7fa1862e05d475a96e2bf59028c33d.zip | |
Fix build
Diffstat (limited to 'openssl/src')
| -rw-r--r-- | openssl/src/ssl/callbacks.rs | 2 | ||||
| -rw-r--r-- | openssl/src/ssl/connector.rs | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/openssl/src/ssl/callbacks.rs b/openssl/src/ssl/callbacks.rs index c0bb4933..d7c48050 100644 --- a/openssl/src/ssl/callbacks.rs +++ b/openssl/src/ssl/callbacks.rs @@ -9,6 +9,8 @@ use foreign_types::ForeignTypeRef; use error::ErrorStack; use dh::Dh; +#[cfg(any(all(feature = "v101", ossl101), all(feature = "v102", ossl102)))] +use ec_key::EcKey; use ssl::{get_callback_idx, get_ssl_callback_idx, SslRef, SniError, NPN_PROTOS_IDX}; #[cfg(any(all(feature = "v102", ossl102), all(feature = "v110", ossl110)))] use ssl::ALPN_PROTOS_IDX; diff --git a/openssl/src/ssl/connector.rs b/openssl/src/ssl/connector.rs index 993de722..e4500c6e 100644 --- a/openssl/src/ssl/connector.rs +++ b/openssl/src/ssl/connector.rs @@ -9,7 +9,7 @@ use x509::X509Ref; #[cfg(ossl101)] lazy_static! { - static ref HOSTNAME_IDX: ::ssl::ExIndex<Ssl, String> = Ssl::new_ex_index().unwrap(); + static ref HOSTNAME_IDX: ::ex_data::Index<Ssl, String> = Ssl::new_ex_index().unwrap(); } // ffdhe2048 from https://wiki.mozilla.org/Security/Server_Side_TLS#ffdhe2048 @@ -338,7 +338,7 @@ fn setup_verify_hostname(ssl: &mut Ssl, domain: &str) -> Result<(), ErrorStack> #[cfg(ossl101)] fn setup_verify_hostname(ssl: &mut Ssl, domain: &str) -> Result<(), ErrorStack> { - let domain = domain.to_owned(); + let domain = domain.to_string(); ssl.set_ex_data(*HOSTNAME_IDX, domain); Ok(()) } |