From 625ed1a1eeb62c4c2ae662c1017b6b07062f1243 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Tue, 19 Mar 2019 00:47:07 -0400 Subject: [PATCH] force SecureSocketOptions.none if 25 w/ no ssl --- .../MailKitSmtpMailDeliveryService.cs | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/Core/Services/Implementations/MailKitSmtpMailDeliveryService.cs b/src/Core/Services/Implementations/MailKitSmtpMailDeliveryService.cs index 6cb3d54a26..b3436e388a 100644 --- a/src/Core/Services/Implementations/MailKitSmtpMailDeliveryService.cs +++ b/src/Core/Services/Implementations/MailKitSmtpMailDeliveryService.cs @@ -67,9 +67,17 @@ namespace Bit.Core.Services client.ServerCertificateValidationCallback = (s, c, h, e) => true; } - var useSsl = _globalSettings.Mail.Smtp.Port == 587 && !_globalSettings.Mail.Smtp.SslOverride ? - false : _globalSettings.Mail.Smtp.Ssl; - await client.ConnectAsync(_globalSettings.Mail.Smtp.Host, _globalSettings.Mail.Smtp.Port, useSsl); + if(!_globalSettings.Mail.Smtp.Ssl && _globalSettings.Mail.Smtp.Port == 25) + { + await client.ConnectAsync(_globalSettings.Mail.Smtp.Host, _globalSettings.Mail.Smtp.Port, + MailKit.Security.SecureSocketOptions.None); + } + else + { + var useSsl = _globalSettings.Mail.Smtp.Port == 587 && !_globalSettings.Mail.Smtp.SslOverride ? + false : _globalSettings.Mail.Smtp.Ssl; + await client.ConnectAsync(_globalSettings.Mail.Smtp.Host, _globalSettings.Mail.Smtp.Port, useSsl); + } if(!string.IsNullOrWhiteSpace(_globalSettings.Mail.Smtp.Username) && !string.IsNullOrWhiteSpace(_globalSettings.Mail.Smtp.Password))