From 7d535f29a85479d79e8fcc0962c688e37d031a63 Mon Sep 17 00:00:00 2001 From: Alexis Mousset Date: Mon, 17 Jul 2017 17:13:23 +0200 Subject: [PATCH] style(all): Rename ssl to tls --- lettre/src/smtp/client/net.rs | 24 ++++++++++++------------ lettre/src/smtp/mod.rs | 16 ++++++++-------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/lettre/src/smtp/client/net.rs b/lettre/src/smtp/client/net.rs index 35a4619..69238ca 100644 --- a/lettre/src/smtp/client/net.rs +++ b/lettre/src/smtp/client/net.rs @@ -13,7 +13,7 @@ pub enum NetworkStream { /// Plain TCP stream Tcp(TcpStream), /// Encrypted TCP stream - Ssl(TlsStream), + Tls(TlsStream), /// Mock stream Mock(MockStream), } @@ -23,7 +23,7 @@ impl NetworkStream { pub fn peer_addr(&self) -> io::Result { match *self { NetworkStream::Tcp(ref s) => s.peer_addr(), - NetworkStream::Ssl(ref s) => s.get_ref().peer_addr(), + NetworkStream::Tls(ref s) => s.get_ref().peer_addr(), NetworkStream::Mock(_) => { Ok(SocketAddr::V4( SocketAddrV4::new(Ipv4Addr::new(127, 0, 0, 1), 80), @@ -36,7 +36,7 @@ impl NetworkStream { pub fn shutdown(&self, how: Shutdown) -> io::Result<()> { match *self { NetworkStream::Tcp(ref s) => s.shutdown(how), - NetworkStream::Ssl(ref s) => s.get_ref().shutdown(how), + NetworkStream::Tls(ref s) => s.get_ref().shutdown(how), NetworkStream::Mock(_) => Ok(()), } } @@ -46,7 +46,7 @@ impl Read for NetworkStream { fn read(&mut self, buf: &mut [u8]) -> io::Result { match *self { NetworkStream::Tcp(ref mut s) => s.read(buf), - NetworkStream::Ssl(ref mut s) => s.read(buf), + NetworkStream::Tls(ref mut s) => s.read(buf), NetworkStream::Mock(ref mut s) => s.read(buf), } } @@ -56,7 +56,7 @@ impl Write for NetworkStream { fn write(&mut self, buf: &[u8]) -> io::Result { match *self { NetworkStream::Tcp(ref mut s) => s.write(buf), - NetworkStream::Ssl(ref mut s) => s.write(buf), + NetworkStream::Tls(ref mut s) => s.write(buf), NetworkStream::Mock(ref mut s) => s.write(buf), } } @@ -64,7 +64,7 @@ impl Write for NetworkStream { fn flush(&mut self) -> io::Result<()> { match *self { NetworkStream::Tcp(ref mut s) => s.flush(), - NetworkStream::Ssl(ref mut s) => s.flush(), + NetworkStream::Tls(ref mut s) => s.flush(), NetworkStream::Mock(ref mut s) => s.flush(), } } @@ -91,7 +91,7 @@ impl Connector for NetworkStream { Some(context) => { context .danger_connect_without_providing_domain_for_certificate_verification_and_server_name_indication(tcp_stream) - .map(NetworkStream::Ssl) + .map(NetworkStream::Tls) .map_err(|e| io::Error::new(ErrorKind::Other, e)) } None => Ok(NetworkStream::Tcp(tcp_stream)), @@ -103,11 +103,11 @@ impl Connector for NetworkStream { *self = match *self { NetworkStream::Tcp(ref mut stream) => { match tls_connector.danger_connect_without_providing_domain_for_certificate_verification_and_server_name_indication(stream.try_clone().unwrap()) { - Ok(ssl_stream) => NetworkStream::Ssl(ssl_stream), + Ok(tls_stream) => NetworkStream::Tls(tls_stream), Err(err) => return Err(io::Error::new(ErrorKind::Other, err)), } } - NetworkStream::Ssl(_) => return Ok(()), + NetworkStream::Tls(_) => return Ok(()), NetworkStream::Mock(_) => return Ok(()), }; @@ -119,7 +119,7 @@ impl Connector for NetworkStream { fn is_encrypted(&self) -> bool { match *self { NetworkStream::Tcp(_) => false, - NetworkStream::Ssl(_) => true, + NetworkStream::Tls(_) => true, NetworkStream::Mock(_) => false, } } @@ -137,7 +137,7 @@ impl Timeout for NetworkStream { fn set_read_timeout(&mut self, duration: Option) -> io::Result<()> { match *self { NetworkStream::Tcp(ref mut stream) => stream.set_read_timeout(duration), - NetworkStream::Ssl(ref mut stream) => stream.get_ref().set_read_timeout(duration), + NetworkStream::Tls(ref mut stream) => stream.get_ref().set_read_timeout(duration), NetworkStream::Mock(_) => Ok(()), } } @@ -146,7 +146,7 @@ impl Timeout for NetworkStream { fn set_write_timeout(&mut self, duration: Option) -> io::Result<()> { match *self { NetworkStream::Tcp(ref mut stream) => stream.set_write_timeout(duration), - NetworkStream::Ssl(ref mut stream) => stream.get_ref().set_write_timeout(duration), + NetworkStream::Tls(ref mut stream) => stream.get_ref().set_write_timeout(duration), NetworkStream::Mock(_) => Ok(()), } } diff --git a/lettre/src/smtp/mod.rs b/lettre/src/smtp/mod.rs index edb6f20..1c9d71b 100644 --- a/lettre/src/smtp/mod.rs +++ b/lettre/src/smtp/mod.rs @@ -63,7 +63,7 @@ //! // Add credentials for authentication //! .credentials(Credentials::new("username".to_string(), "password".to_string())) //! // Specify a TLS security level. You can also specify an TlsConnector with -//! // .tls_connector(TlsConnector::Ssl23) +//! // .tls_connector(TlsConnector::builder().unwrap().supported_protocols(vec![Protocol::Tlsv12]).build().unwrap()) //! .security_level(SecurityLevel::AlwaysEncrypt) //! // Enable SMTPUTF8 if the server supports it //! .smtp_utf8(true) @@ -231,29 +231,29 @@ impl SmtpTransportBuilder { } /// Use STARTTLS with a specific context - pub fn tls_connector(mut self, ssl_context: TlsConnector) -> SmtpTransportBuilder { - self.tls_connector = ssl_context; + pub fn tls_connector(mut self, tls_context: TlsConnector) -> SmtpTransportBuilder { + self.tls_connector = tls_context; self } - /// Set the security level for SSL/TLS + /// Set the security level for TLS pub fn security_level(mut self, level: SecurityLevel) -> SmtpTransportBuilder { self.security_level = level; self } - /// Require SSL/TLS using STARTTLS + /// Require TLS using STARTTLS /// - /// Incompatible with `ssl_wrapper()`` + /// Incompatible with `tls_wrapper()`` pub fn encrypt(mut self) -> SmtpTransportBuilder { self.security_level = SecurityLevel::AlwaysEncrypt; self } - /// Require SSL/TLS using SMTPS + /// Require TLS using SMTPS /// /// Incompatible with `encrypt()` - pub fn ssl_wrapper(mut self) -> SmtpTransportBuilder { + pub fn tls_wrapper(mut self) -> SmtpTransportBuilder { self.security_level = SecurityLevel::EncryptedWrapper; self }