aboutsummaryrefslogtreecommitdiff
path: root/openssl/src/ssl/connector.rs
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2017-12-04 22:01:07 -0800
committerSteven Fackler <[email protected]>2017-12-04 22:15:56 -0800
commit3207e57a098ea4cacdc46c0f4979e099da06a436 (patch)
tree99f44842a89d0759f231075e5986347f865cedc4 /openssl/src/ssl/connector.rs
parentMerge pull request #788 from sfackler/ssl-docs (diff)
downloadrust-openssl-3207e57a098ea4cacdc46c0f4979e099da06a436.tar.xz
rust-openssl-3207e57a098ea4cacdc46c0f4979e099da06a436.zip
Finish documentation for the ssl module
Closes #727
Diffstat (limited to 'openssl/src/ssl/connector.rs')
-rw-r--r--openssl/src/ssl/connector.rs24
1 files changed, 20 insertions, 4 deletions
diff --git a/openssl/src/ssl/connector.rs b/openssl/src/ssl/connector.rs
index b650d3e7..a730cc49 100644
--- a/openssl/src/ssl/connector.rs
+++ b/openssl/src/ssl/connector.rs
@@ -3,7 +3,7 @@ use std::ops::{Deref, DerefMut};
use dh::Dh;
use error::ErrorStack;
-use ssl::{self, HandshakeError, Ssl, SslContext, SslContextBuilder, SslMethod, SslStream,
+use ssl::{self, HandshakeError, Ssl, SslRef, SslContext, SslContextBuilder, SslMethod, SslStream,
SSL_VERIFY_PEER};
use pkey::PKeyRef;
use version;
@@ -91,7 +91,7 @@ impl SslConnectorBuilder {
self
}
- /// Consumes the builder, returning a `SslConnector`.
+ /// Consumes the builder, returning an `SslConnector`.
pub fn build(self) -> SslConnector {
SslConnector(self.0.build())
}
@@ -162,12 +162,14 @@ impl SslConnector {
pub struct ConnectConfiguration(Ssl);
impl ConnectConfiguration {
- /// Returns a shared reference to the inner `Ssl`.
+ #[deprecated(since = "0.9.23",
+ note = "ConnectConfiguration now implements Deref<Target=SslRef>")]
pub fn ssl(&self) -> &Ssl {
&self.0
}
- /// Returns a mutable reference to the inner `Ssl`.
+ #[deprecated(since = "0.9.23",
+ note = "ConnectConfiguration now implements DerefMut<Target=SslRef>")]
pub fn ssl_mut(&mut self) -> &mut Ssl {
&mut self.0
}
@@ -207,6 +209,20 @@ impl ConnectConfiguration {
}
}
+impl Deref for ConnectConfiguration {
+ type Target = SslRef;
+
+ fn deref(&self) -> &SslRef {
+ &self.0
+ }
+}
+
+impl DerefMut for ConnectConfiguration {
+ fn deref_mut(&mut self) -> &mut SslRef {
+ &mut self.0
+ }
+}
+
/// A builder for `SslAcceptor`s.
pub struct SslAcceptorBuilder(SslContextBuilder);