From 3c19702299e17554a031b834da1f3c69c8a48e23 Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Sat, 6 Jan 2018 08:36:35 -0800 Subject: Rename key serialization/deserialization methods Also document their specific formats. Closes #502 --- openssl/src/ssl/connector.rs | 2 +- openssl/src/ssl/test.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'openssl/src/ssl') diff --git a/openssl/src/ssl/connector.rs b/openssl/src/ssl/connector.rs index fb9a42e8..54910733 100644 --- a/openssl/src/ssl/connector.rs +++ b/openssl/src/ssl/connector.rs @@ -196,7 +196,7 @@ impl SslAcceptor { /// [docs]: https://wiki.mozilla.org/Security/Server_Side_TLS pub fn mozilla_intermediate(method: SslMethod) -> Result { let mut ctx = ctx(method)?; - let dh = Dh::from_pem(DHPARAM_PEM.as_bytes())?; + let dh = Dh::params_from_pem(DHPARAM_PEM.as_bytes())?; ctx.set_tmp_dh(&dh)?; setup_curves(&mut ctx)?; ctx.set_cipher_list( diff --git a/openssl/src/ssl/test.rs b/openssl/src/ssl/test.rs index 99c0e1f2..db478d36 100644 --- a/openssl/src/ssl/test.rs +++ b/openssl/src/ssl/test.rs @@ -1027,7 +1027,7 @@ fn tmp_dh_callback() { ctx.set_tmp_dh_callback(|_, _, _| { CALLED_BACK.store(true, Ordering::SeqCst); let dh = include_bytes!("../../test/dhparams.pem"); - Dh::from_pem(dh) + Dh::params_from_pem(dh) }); let ssl = Ssl::new(&ctx.build()).unwrap(); ssl.accept(stream).unwrap(); @@ -1096,7 +1096,7 @@ fn tmp_dh_callback_ssl() { ssl.set_tmp_dh_callback(|_, _, _| { CALLED_BACK.store(true, Ordering::SeqCst); let dh = include_bytes!("../../test/dhparams.pem"); - Dh::from_pem(dh) + Dh::params_from_pem(dh) }); ssl.accept(stream).unwrap(); }); -- cgit v1.2.3