Skip to content

Commit 6887154

Browse files
committed
Updated SSL certificates
1 parent 7e6c440 commit 6887154

File tree

2 files changed

+10
-15
lines changed

2 files changed

+10
-15
lines changed

MailKit/MailService.cs

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -437,27 +437,24 @@ internal static bool IsKnownMailServerCertificate (X509Certificate2 certificate)
437437
case "imap.gmail.com":
438438
switch (issuer) {
439439
case GMailCertificateIssuer:
440-
return (serial == "4D8A5F329EEC61280980D4C195B2C4BF" && fingerprint == "089B27BE05BDE333D90D9D07628D03EDBB0EE98B") // Expires 9/5/2024 12:28:55 PM
441-
|| (serial == "65448AC5937894E50A8262A7D34A445C" && fingerprint == "9B39342357139F812A4B5D06E8B757680CB4389C") // Expires 9/16/2024 3:37:22 AM
442-
|| (serial == "00C36B38D49A11594910E283D19905BF6E" && fingerprint == "EB25D383FFCC3C9D8A7F913A9382B023FBE9BE3A"); // Expires 10/22/2024 8:49:07 AM
440+
return (serial == "00C36B38D49A11594910E283D19905BF6E" && fingerprint == "EB25D383FFCC3C9D8A7F913A9382B023FBE9BE3A") // Expires 10/22/2024 8:49:07 AM
441+
|| (serial == "00FFA7D1CF23CECCC110CD05F37B6275A7" && fingerprint == "573FC78F1842DC51063958234A9A6D5AF31E786B"); // Expires 11/4/2024 7:15:59 AM
443442
default:
444443
return false;
445444
}
446445
case "pop.gmail.com":
447446
switch (issuer) {
448447
case GMailCertificateIssuer:
449-
return (serial == "00FA32D95AF3422569092D78466AFEE4D5" && fingerprint == "C7229786F10328D450F2FDC3611C78BCE1347869") // Expires 9/5/2024 12:28:48 PM
450-
|| (serial == "00C2B81455D16FD29212093A38DADEDE80" && fingerprint == "9EEFDE1E1B2D6EAB8643CB5BBB5D248A33CCEB15") // Expires 9/16/2024 3:37:28 AM
451-
|| (serial == "00E603D30C122C29C709C52025F805A4B6" && fingerprint == "C6F47B3813CF68DCFA563C2801C389DE3464047E"); // Expires 10/22/2024 8:49:07 AM
448+
return (serial == "00E603D30C122C29C709C52025F805A4B6" && fingerprint == "C6F47B3813CF68DCFA563C2801C389DE3464047E") // Expires 10/22/2024 8:49:07 AM
449+
|| (serial == "008C8CB1EEE01774C00AA15482E99FEFF1" && fingerprint == "D1B888CC09526DCAA017CE51AB439B1CA6ACA646"); // Expires 11/4/2024 7:15:59 AM
452450
default:
453451
return false;
454452
}
455453
case "smtp.gmail.com":
456454
switch (issuer) {
457455
case GMailCertificateIssuer:
458-
return (serial == "00F94833B0DBBC6DD0094FF1B65826D822" && fingerprint == "AFA2FF1AF73A65FA90F539B3F79A9983FEB49353") // Expires 9/5/2024 12:29:37 PM
459-
|| (serial == "684ED2CE89191FE81079C2D39BED950F" && fingerprint == "7C3726C70F8F43DEAE4EAC03647C92DDEB24FDA7") // Expires 9/16/2024 3:37:43 AM
460-
|| (serial == "67549C98536BBE090AA741E2192CF045" && fingerprint == "FAA1AC71FD9B8537AF0A53A54553782C9FC83D78"); // Expires 10/22/2024 8:49:28 AM
456+
return (serial == "67549C98536BBE090AA741E2192CF045" && fingerprint == "FAA1AC71FD9B8537AF0A53A54553782C9FC83D78") // Expires 10/22/2024 8:49:28 AM
457+
|| (serial == "2FC65EE98F6A70A80AC7565B356EB8FF" && fingerprint == "72223DC8A6992339E848AA9DDD82C79A65351387"); // Expires 11/4/2024 7:16:04 AM
461458
default:
462459
return false;
463460
}
@@ -487,8 +484,7 @@ internal static bool IsKnownMailServerCertificate (X509Certificate2 certificate)
487484
case "*.imap.mail.yahoo.com":
488485
switch (issuer) {
489486
case YahooCertificateIssuer:
490-
return (serial == "0A45FA402BCAB3FE676B8B75B42659F6" && fingerprint == "C8FC6A94EBD2CABC8822868B9BFBC3104B97C5F8") // Expires 8/14/2024 7:59:59 PM
491-
|| (serial == "052200C5872E1737CD7D556E3FE99EBE" && fingerprint == "FEA0FB760215F3C23E76769D23BA46F9F3EADBAF"); // Expires 1/8/2025 6:59:59 PM
487+
return (serial == "052200C5872E1737CD7D556E3FE99EBE" && fingerprint == "FEA0FB760215F3C23E76769D23BA46F9F3EADBAF"); // Expires 1/8/2025 6:59:59 PM
492488
default:
493489
return false;
494490
}
@@ -503,8 +499,7 @@ internal static bool IsKnownMailServerCertificate (X509Certificate2 certificate)
503499
case "smtp.mail.yahoo.com":
504500
switch (issuer) {
505501
case YahooCertificateIssuer:
506-
return (serial == "03E9DF3924C4D64EE2D02C04CE3A3559" && fingerprint == "10DA24087B8C72273125644FF74F5DCC54153D1D") // Expires 9/11/2024 7:59:59 PM
507-
|| (serial == "07B21FFCE7DD0BF8CB58DF2B310C8DAC" && fingerprint == "3CA00F0E097892120775AC4DEC283BEFFD4702A1"); // Expires 1/22/2025 6:59:59 PM
502+
return (serial == "07B21FFCE7DD0BF8CB58DF2B310C8DAC" && fingerprint == "3CA00F0E097892120775AC4DEC283BEFFD4702A1"); // Expires 1/22/2025 6:59:59 PM
508503
default:
509504
return false;
510505
}

UnitTests/Security/SslHandshakeExceptionTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ public async Task TestExpiredCertificateValidationFailureAsync ()
378378
static void AssertBadSslWrongHostServerCertificate (X509Certificate2 certificate)
379379
{
380380
Assert.That (certificate.GetNameInfo (X509NameType.SimpleName, false), Is.EqualTo ("*.badssl.com"), "CommonName");
381-
Assert.That (certificate.Issuer, Is.EqualTo ("CN=R3, O=Let's Encrypt, C=US"), "Issuer");
381+
Assert.That (certificate.Issuer, Is.EqualTo ("CN=R11, O=Let's Encrypt, C=US"), "Issuer");
382382
//Assert.That (certificate.SerialNumber, Is.EqualTo ("008040A36688A3B1F2"), "SerialNumber");
383383
//Assert.That (certificate.Thumbprint, Is.EqualTo ("209BADBBC9E63BBFFC301B3E30C5B51216FCE81D"), "Thumbprint");
384384
}
@@ -546,7 +546,7 @@ public async Task TestUntrustedRootCertificateValidationFailureAsync ()
546546
static void AssertBadSslRevokedServerCertificate (X509Certificate2 certificate)
547547
{
548548
Assert.That (certificate.GetNameInfo (X509NameType.SimpleName, false), Is.EqualTo ("revoked.badssl.com"), "CommonName");
549-
Assert.That (certificate.Issuer, Is.EqualTo ("CN=R3, O=Let's Encrypt, C=US"), "Issuer");
549+
Assert.That (certificate.Issuer, Is.EqualTo ("CN=E6, O=Let's Encrypt, C=US"), "Issuer");
550550
//Assert.That (certificate.SerialNumber, Is.EqualTo ("008040A36688A3B1F2"), "SerialNumber");
551551
//Assert.That (certificate.Thumbprint, Is.EqualTo ("209BADBBC9E63BBFFC301B3E30C5B51216FCE81D"), "Thumbprint");
552552
}

0 commit comments

Comments
 (0)