aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2026-02-22 06:34:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix: If SMTP port is 25, SSL shouldn't be used"

Browse Source 
This reverts commit 9423bc4ea7.
This commit is contained in:
nicolas.dorier
2022-06-29 15:12:30 +09:00
parent 3d7f628014
commit 4a71b952b6
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
BTCPayServer/Services/Mails/EmailSettings.cs
View File

@@ -75,10 +75,7 @@ namespace BTCPayServer.Services.Mails
client.ServerCertificateValidationCallback = (s, c, h, e) => true;
#pragma warning restore CA5359 // Do Not Disable Certificate Validation
}
var sslOptions = MailKit.Security.SecureSocketOptions.Auto;
if (Port is int p && p == 25) // Workaround for https://github.com/jstedfast/MailKit/pull/1398
sslOptions = MailKit.Security.SecureSocketOptions.None;
await client.ConnectAsync(Server, Port.Value, sslOptions, connectCancel.Token);
await client.ConnectAsync(Server, Port.Value, MailKit.Security.SecureSocketOptions.Auto, connectCancel.Token);
if ((client.Capabilities & SmtpCapabilities.Authentication) != 0)
await client.AuthenticateAsync(Login ?? string.Empty, Password ?? string.Empty, connectCancel.Token);
}