mirror of
https://github.com/ViViDboarder/bitwarden_rs.git
synced 2024-11-05 04:46:36 +00:00
Merge pull request #918 from dani-garcia/revert-901-feature/opportunistic_tls
Revert "Use opportunistic TLS in SMTP connections"
This commit is contained in:
commit
935f38692f
20
src/mail.rs
20
src/mail.rs
@ -18,21 +18,21 @@ use chrono::NaiveDateTime;
|
|||||||
fn mailer() -> SmtpTransport {
|
fn mailer() -> SmtpTransport {
|
||||||
let host = CONFIG.smtp_host().unwrap();
|
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 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() {
|
if CONFIG.smtp_explicit_tls() {
|
||||||
ClientSecurity::Wrapper(tls_params)
|
ClientSecurity::Wrapper(params)
|
||||||
} else {
|
} else {
|
||||||
ClientSecurity::Required(tls_params)
|
ClientSecurity::Required(params)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
ClientSecurity::Opportunistic(tls_params)
|
ClientSecurity::None
|
||||||
};
|
};
|
||||||
|
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
|
Loading…
Reference in New Issue
Block a user