Commit dbbf446a authored by Steven Fackler's avatar Steven Fackler
Browse files

Fix build

parent c68db708

openssl/src/ssl/callbacks.rs

+2 −0
Original line number Diff line number Diff line
@@ -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;

openssl/src/ssl/connector.rs

+2 −2
Original line number Diff line number Diff line
@@ -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(())

}