From d2d9fb08cc6de0d69e895b854837b3853fd5baf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa?= Date: Thu, 19 Mar 2020 13:56:53 +0100 Subject: [PATCH] Revert "Use opportunistic TLS in SMTP connections" --- src/mail.rs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/mail.rs b/src/mail.rs index 699bd156..2878ed83 100644 --- a/src/mail.rs +++ b/src/mail.rs @@ -18,21 +18,21 @@ use chrono::NaiveDateTime; fn mailer() -> SmtpTransport { let host = CONFIG.smtp_host().unwrap(); - let tls = TlsConnector::builder() - .min_protocol_version(Some(Protocol::Tlsv11)) - .build() - .unwrap(); - - let tls_params = ClientTlsParameters::new(host.clone(), tls); - let client_security = if CONFIG.smtp_ssl() { + let tls = TlsConnector::builder() + .min_protocol_version(Some(Protocol::Tlsv11)) + .build() + .unwrap(); + + let params = ClientTlsParameters::new(host.clone(), tls); + if CONFIG.smtp_explicit_tls() { - ClientSecurity::Wrapper(tls_params) + ClientSecurity::Wrapper(params) } else { - ClientSecurity::Required(tls_params) + ClientSecurity::Required(params) } } else { - ClientSecurity::Opportunistic(tls_params) + ClientSecurity::None }; use std::time::Duration;