Merge pull request #798 from sfackler/deprecation

Remove deprecated APIs

3 files changed, 3 insertions, 74 deletions

diff --git a/openssl/src/ssl/callbacks.rs b/openssl/src/ssl/callbacks.rs
index 78602a54..33032ec8 100644
--- a/openssl/src/ssl/callbacks.rs
+++ b/openssl/src/ssl/callbacks.rs
@@ -10,7 +10,7 @@ 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 ec::EcKey;
 use ssl::{get_callback_idx, get_ssl_callback_idx, SniError, SslRef, 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 dc13ea97..215d0358 100644
--- a/openssl/src/ssl/connector.rs
+++ b/openssl/src/ssl/connector.rs
@@ -72,18 +72,6 @@ impl SslConnectorBuilder {
         Ok(SslConnectorBuilder(ctx))
     }
 
-    #[deprecated(since = "0.9.23",
-                 note = "SslConnectorBuilder now implements Deref<Target=SslContextBuilder>")]
-    pub fn builder(&self) -> &SslContextBuilder {
-        self
-    }
-
-    #[deprecated(since = "0.9.23",
-                 note = "SslConnectorBuilder now implements DerefMut<Target=SslContextBuilder>")]
-    pub fn builder_mut(&mut self) -> &mut SslContextBuilder {
-        self
-    }
-
     /// Consumes the builder, returning an `SslConnector`.
     pub fn build(self) -> SslConnector {
         SslConnector(self.0.build())
@@ -125,24 +113,6 @@ impl SslConnector {
         self.configure()?.connect(domain, stream)
     }
 
-    #[deprecated(
-        since = "0.9.24",
-        note = "use `ConnectConfiguration::verify_hostname` and `ConnectConfiguration::use_server_name_indication` instead")]
-    pub fn danger_connect_without_providing_domain_for_certificate_verification_and_server_name_indication<
-        S,
-    >(
-        &self,
-        stream: S,
-    ) -> Result<SslStream<S>, HandshakeError<S>>
-    where
-        S: Read + Write,
-    {
-        self.configure()?
-            .use_server_name_indication(false)
-            .verify_hostname(false)
-            .connect("", stream)
-    }
-
     /// Returns a structure allowing for configuration of a single TLS session before connection.
     pub fn configure(&self) -> Result<ConnectConfiguration, ErrorStack> {
         Ssl::new(&self.0).map(|ssl| ConnectConfiguration {
@@ -161,18 +131,6 @@ pub struct ConnectConfiguration {
 }
 
 impl ConnectConfiguration {
-    #[deprecated(since = "0.9.23",
-                 note = "ConnectConfiguration now implements Deref<Target=SslRef>")]
-    pub fn ssl(&self) -> &Ssl {
-        &self.ssl
-    }
-
-    #[deprecated(since = "0.9.23",
-                 note = "ConnectConfiguration now implements DerefMut<Target=SslRef>")]
-    pub fn ssl_mut(&mut self) -> &mut Ssl {
-        &mut self.ssl
-    }
-
     /// Configures the use of Server Name Indication (SNI) when connecting.
     ///
     /// Defaults to `true`.
@@ -212,23 +170,6 @@ impl ConnectConfiguration {
 
         self.ssl.connect(stream)
     }
-
-    #[deprecated(
-        since = "0.9.24",
-        note = "use `ConnectConfiguration::verify_hostname` and `ConnectConfiguration::use_server_name_indication` instead")]
-    pub fn danger_connect_without_providing_domain_for_certificate_verification_and_server_name_indication<
-        S,
-    >(
-        self,
-        stream: S,
-    ) -> Result<SslStream<S>, HandshakeError<S>>
-    where
-        S: Read + Write,
-    {
-        self.use_server_name_indication(false)
-            .verify_hostname(false)
-            .connect("", stream)
-    }
 }
 
 impl Deref for ConnectConfiguration {
@@ -343,18 +284,6 @@ impl SslAcceptorBuilder {
         Ok(self)
     }
 
-    #[deprecated(since = "0.9.23",
-                 note = "SslAcceptorBuilder now implements Deref<Target=SslContextBuilder>")]
-    pub fn builder(&self) -> &SslContextBuilder {
-        self
-    }
-
-    #[deprecated(since = "0.9.23",
-                 note = "SslAcceptorBuilder now implements DerefMut<Target=SslContextBuilder>")]
-    pub fn builder_mut(&mut self) -> &mut SslContextBuilder {
-        self
-    }
-
     /// Consumes the builder, returning a `SslAcceptor`.
     pub fn build(self) -> SslAcceptor {
         SslAcceptor(self.0.build())
diff --git a/openssl/src/ssl/tests/mod.rs b/openssl/src/ssl/tests/mod.rs
index 69369ed4..ee4c4a99 100644
--- a/openssl/src/ssl/tests/mod.rs
+++ b/openssl/src/ssl/tests/mod.rs
@@ -1263,7 +1263,7 @@ fn tmp_ecdh_callback() {
             .unwrap();
         ctx.set_tmp_ecdh_callback(|_, _, _| {
             CALLED_BACK.store(true, Ordering::SeqCst);
-            EcKey::new_by_curve_name(Nid::X9_62_PRIME256V1)
+            EcKey::from_curve_name(Nid::X9_62_PRIME256V1)
         });
         let ssl = Ssl::new(&ctx.build()).unwrap();
         ssl.accept(stream).unwrap();
@@ -1332,7 +1332,7 @@ fn tmp_ecdh_callback_ssl() {
         let mut ssl = Ssl::new(&ctx.build()).unwrap();
         ssl.set_tmp_ecdh_callback(|_, _, _| {
             CALLED_BACK.store(true, Ordering::SeqCst);
-            EcKey::new_by_curve_name(Nid::X9_62_PRIME256V1)
+            EcKey::from_curve_name(Nid::X9_62_PRIME256V1)
         });
         ssl.accept(stream).unwrap();
     });