rust/lettre
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(transport-smtp): Use rust-openssl 0.8

Browse Source
This commit is contained in:
Alexis Mousset
2016-08-31 23:15:37 +02:00
parent 495c21b776
commit b4603b4fbc
5 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/transport/smtp/client/net.rs
View File

@@ -24,7 +24,7 @@ impl Connector for NetworkStream {
match ssl_context {
Some(context) => {
match SslStream::connect_generic(context, tcp_stream) {
match SslStream::connect(context, tcp_stream) {
Ok(stream) => Ok(NetworkStream::Ssl(stream)),
Err(err) => Err(io::Error::new(ErrorKind::Other, err)),
}
@@ -34,16 +34,19 @@ impl Connector for NetworkStream {
}
fn upgrade_tls(&mut self, ssl_context: &SslContext) -> io::Result<()> {
*self = match self.clone() {
NetworkStream::Plain(stream) => {
match SslStream::connect_generic(ssl_context, stream) {
*self = match *self {
NetworkStream::Plain(ref mut stream) => {
match SslStream::connect(ssl_context, stream.try_clone().unwrap()) {
Ok(ssl_stream) => NetworkStream::Ssl(ssl_stream),
Err(err) => return Err(io::Error::new(ErrorKind::Other, err)),
}
}
NetworkStream::Ssl(stream) => NetworkStream::Ssl(stream),
NetworkStream::Ssl(_) => return Ok(())
};
Ok(())
}
fn is_encrypted(&self) -> bool {
@@ -63,16 +66,6 @@ pub enum NetworkStream {
Ssl(SslStream<TcpStream>),
}
impl Clone for NetworkStream {
#[inline]
fn clone(&self) -> NetworkStream {
match *self {
NetworkStream::Plain(ref stream) => NetworkStream::Plain(stream.try_clone().unwrap()),
NetworkStream::Ssl(ref stream) => NetworkStream::Ssl(stream.try_clone().unwrap()),
}
}
}
impl Debug for NetworkStream {
fn fmt(&self, f: &mut Formatter) -> fmt::Result {
f.write_str("NetworkStream(_)")