From bdcb52d8d7070f026391e53027a9971e644f3f40 Mon Sep 17 00:00:00 2001 From: "J.C. Jones" Date: Tue, 20 Feb 2018 16:27:14 -0500 Subject: [PATCH] Bug 1434300 - Add the DigiCert whitelisted SPKIs r=keeler This adds the 4 digicert CAs to our whitelist as specified in Google's details on the Chromium version of this plan [1]. [1] https://chromium.googlesource.com/chromium/src/+/c022914eb2e7eb78c5252723c31df770b05c023e/net/data/ssl/symantec/README.md MozReview-Commit-ID: BR7t1UheKeS --HG-- rename : security/certverifier/TrustOverride-AppleGoogleData.inc => security/certverifier/TrustOverride-AppleGoogleDigiCertData.inc extra : rebase_source : 328a3b03a2c40fdf77497430481aa01df6f0059d --- .../certverifier/NSSCertDBTrustDomain.cpp | 2 +- ...TrustOverride-AppleGoogleDigiCertData.inc} | 98 ++++++++++++++++++- security/manager/ssl/nsNSSCallbacks.cpp | 2 +- 3 files changed, 98 insertions(+), 4 deletions(-) rename security/certverifier/{TrustOverride-AppleGoogleData.inc => TrustOverride-AppleGoogleDigiCertData.inc} (68%) diff --git a/security/certverifier/NSSCertDBTrustDomain.cpp b/security/certverifier/NSSCertDBTrustDomain.cpp index 5629a1af8891..9eca579fb389 100644 --- a/security/certverifier/NSSCertDBTrustDomain.cpp +++ b/security/certverifier/NSSCertDBTrustDomain.cpp @@ -38,7 +38,7 @@ #include "TrustOverride-StartComAndWoSignData.inc" #include "TrustOverride-GlobalSignData.inc" #include "TrustOverride-SymantecData.inc" -#include "TrustOverride-AppleGoogleData.inc" +#include "TrustOverride-AppleGoogleDigiCertData.inc" using namespace mozilla; using namespace mozilla::pkix; diff --git a/security/certverifier/TrustOverride-AppleGoogleData.inc b/security/certverifier/TrustOverride-AppleGoogleDigiCertData.inc similarity index 68% rename from security/certverifier/TrustOverride-AppleGoogleData.inc rename to security/certverifier/TrustOverride-AppleGoogleDigiCertData.inc index d3b9ed682eda..7a616efdd8b2 100644 --- a/security/certverifier/TrustOverride-AppleGoogleData.inc +++ b/security/certverifier/TrustOverride-AppleGoogleDigiCertData.inc @@ -1,5 +1,5 @@ // Script from security/manager/tools/crtshToIdentifyingStruct/crtshToIdentifyingStruct.py -// Invocation: crtshToIdentifyingStruct.py -spki -listname RootAppleAndGoogleSPKIs 142951186 23635000 5250464 12716200 19602712 19602724 21760447 19602706 19602741 +// Invocation: crtshToIdentifyingStruct.py -spki -listname RootAppleAndGoogleSPKIs 142951186 23635000 5250464 12716200 19602712 19602724 21760447 19602706 19602741 8656329 8568700 281399768 281399766 // /C=US/O=Google Inc/CN=Google Internet Authority G2 // SHA256 Fingerprint: 9B:75:9D:41:E3:DE:30:F9:D2:F9:02:02:7D:79:2B:65 @@ -200,8 +200,98 @@ static const uint8_t CAAppleISTCA6G1SPKI[294] = { 0xB3, 0xC9, 0x29, 0x02, 0x03, 0x01, 0x00, 0x01, }; +// /C=US/O=DigiCert Inc/OU=www.digicert.com/CN=DigiCert Global Root G2 +// SHA256 Fingerprint: CB:3C:CB:B7:60:31:E5:E0:13:8F:8D:D3:9A:23:F9:DE +// 47:FF:C3:5E:43:C1:14:4C:EA:27:D4:6A:5A:B1:CB:5F +// https://crt.sh/?id=8656329 (crt.sh ID=8656329) +static const uint8_t CADigiCertGlobalRootG2SPKI[294] = { + 0x30, 0x82, 0x01, 0x22, 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, + 0x0D, 0x01, 0x01, 0x01, 0x05, 0x00, 0x03, 0x82, 0x01, 0x0F, 0x00, 0x30, 0x82, + 0x01, 0x0A, 0x02, 0x82, 0x01, 0x01, 0x00, 0xBB, 0x37, 0xCD, 0x34, 0xDC, 0x7B, + 0x6B, 0xC9, 0xB2, 0x68, 0x90, 0xAD, 0x4A, 0x75, 0xFF, 0x46, 0xBA, 0x21, 0x0A, + 0x08, 0x8D, 0xF5, 0x19, 0x54, 0xC9, 0xFB, 0x88, 0xDB, 0xF3, 0xAE, 0xF2, 0x3A, + 0x89, 0x91, 0x3C, 0x7A, 0xE6, 0xAB, 0x06, 0x1A, 0x6B, 0xCF, 0xAC, 0x2D, 0xE8, + 0x5E, 0x09, 0x24, 0x44, 0xBA, 0x62, 0x9A, 0x7E, 0xD6, 0xA3, 0xA8, 0x7E, 0xE0, + 0x54, 0x75, 0x20, 0x05, 0xAC, 0x50, 0xB7, 0x9C, 0x63, 0x1A, 0x6C, 0x30, 0xDC, + 0xDA, 0x1F, 0x19, 0xB1, 0xD7, 0x1E, 0xDE, 0xFD, 0xD7, 0xE0, 0xCB, 0x94, 0x83, + 0x37, 0xAE, 0xEC, 0x1F, 0x43, 0x4E, 0xDD, 0x7B, 0x2C, 0xD2, 0xBD, 0x2E, 0xA5, + 0x2F, 0xE4, 0xA9, 0xB8, 0xAD, 0x3A, 0xD4, 0x99, 0xA4, 0xB6, 0x25, 0xE9, 0x9B, + 0x6B, 0x00, 0x60, 0x92, 0x60, 0xFF, 0x4F, 0x21, 0x49, 0x18, 0xF7, 0x67, 0x90, + 0xAB, 0x61, 0x06, 0x9C, 0x8F, 0xF2, 0xBA, 0xE9, 0xB4, 0xE9, 0x92, 0x32, 0x6B, + 0xB5, 0xF3, 0x57, 0xE8, 0x5D, 0x1B, 0xCD, 0x8C, 0x1D, 0xAB, 0x95, 0x04, 0x95, + 0x49, 0xF3, 0x35, 0x2D, 0x96, 0xE3, 0x49, 0x6D, 0xDD, 0x77, 0xE3, 0xFB, 0x49, + 0x4B, 0xB4, 0xAC, 0x55, 0x07, 0xA9, 0x8F, 0x95, 0xB3, 0xB4, 0x23, 0xBB, 0x4C, + 0x6D, 0x45, 0xF0, 0xF6, 0xA9, 0xB2, 0x95, 0x30, 0xB4, 0xFD, 0x4C, 0x55, 0x8C, + 0x27, 0x4A, 0x57, 0x14, 0x7C, 0x82, 0x9D, 0xCD, 0x73, 0x92, 0xD3, 0x16, 0x4A, + 0x06, 0x0C, 0x8C, 0x50, 0xD1, 0x8F, 0x1E, 0x09, 0xBE, 0x17, 0xA1, 0xE6, 0x21, + 0xCA, 0xFD, 0x83, 0xE5, 0x10, 0xBC, 0x83, 0xA5, 0x0A, 0xC4, 0x67, 0x28, 0xF6, + 0x73, 0x14, 0x14, 0x3D, 0x46, 0x76, 0xC3, 0x87, 0x14, 0x89, 0x21, 0x34, 0x4D, + 0xAF, 0x0F, 0x45, 0x0C, 0xA6, 0x49, 0xA1, 0xBA, 0xBB, 0x9C, 0xC5, 0xB1, 0x33, + 0x83, 0x29, 0x85, 0x02, 0x03, 0x01, 0x00, 0x01, +}; + +// /C=US/O=DigiCert Inc/OU=www.digicert.com/CN=DigiCert Global Root G3 +// SHA256 Fingerprint: 31:AD:66:48:F8:10:41:38:C7:38:F3:9E:A4:32:01:33 +// 39:3E:3A:18:CC:02:29:6E:F9:7C:2A:C9:EF:67:31:D0 +// https://crt.sh/?id=8568700 (crt.sh ID=8568700) +static const uint8_t CADigiCertGlobalRootG3SPKI[120] = { + 0x30, 0x76, 0x30, 0x10, 0x06, 0x07, 0x2A, 0x86, 0x48, 0xCE, 0x3D, 0x02, 0x01, + 0x06, 0x05, 0x2B, 0x81, 0x04, 0x00, 0x22, 0x03, 0x62, 0x00, 0x04, 0xDD, 0xA7, + 0xD9, 0xBB, 0x8A, 0xB8, 0x0B, 0xFB, 0x0B, 0x7F, 0x21, 0xD2, 0xF0, 0xBE, 0xBE, + 0x73, 0xF3, 0x33, 0x5D, 0x1A, 0xBC, 0x34, 0xEA, 0xDE, 0xC6, 0x9B, 0xBC, 0xD0, + 0x95, 0xF6, 0xF0, 0xCC, 0xD0, 0x0B, 0xBA, 0x61, 0x5B, 0x51, 0x46, 0x7E, 0x9E, + 0x2D, 0x9F, 0xEE, 0x8E, 0x63, 0x0C, 0x17, 0xEC, 0x07, 0x70, 0xF5, 0xCF, 0x84, + 0x2E, 0x40, 0x83, 0x9C, 0xE8, 0x3F, 0x41, 0x6D, 0x3B, 0xAD, 0xD3, 0xA4, 0x14, + 0x59, 0x36, 0x78, 0x9D, 0x03, 0x43, 0xEE, 0x10, 0x13, 0x6C, 0x72, 0xDE, 0xAE, + 0x88, 0xA7, 0xA1, 0x6B, 0xB5, 0x43, 0xCE, 0x67, 0xDC, 0x23, 0xFF, 0x03, 0x1C, + 0xA3, 0xE2, 0x3E, +}; + +// /C=US/O=DigiCert Inc/OU=www.digicert.com/CN=DigiCert Transition ECC Root +// SHA256 Fingerprint: 45:BF:04:DC:A5:DE:7A:63:39:F1:DF:83:5B:C9:01:34 +// 57:B4:87:FD:B4:30:8E:40:80:C6:42:3C:8E:4B:27:05 +// https://crt.sh/?id=281399768 (crt.sh ID=281399768) +static const uint8_t CADigiCertTransitionECCRootSPKI[91] = { + 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2A, 0x86, 0x48, 0xCE, 0x3D, 0x02, 0x01, + 0x06, 0x08, 0x2A, 0x86, 0x48, 0xCE, 0x3D, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, + 0x04, 0x5A, 0xFF, 0x46, 0xDC, 0xC9, 0xAE, 0xBD, 0x2C, 0xE7, 0x1C, 0x56, 0x97, + 0xE4, 0xFA, 0xEB, 0xD5, 0xC6, 0xFF, 0x75, 0x53, 0x23, 0x5E, 0xC6, 0xB0, 0x7D, + 0xAC, 0xAC, 0x57, 0x3A, 0x9F, 0x94, 0x50, 0x07, 0x0D, 0xF1, 0xF3, 0x4D, 0x51, + 0x0D, 0x7D, 0xFD, 0x88, 0x41, 0x82, 0x3F, 0x1C, 0x7F, 0xFB, 0xC3, 0x1E, 0xFA, + 0xF6, 0xEB, 0xD4, 0x37, 0xFF, 0xFE, 0x18, 0x9D, 0x01, 0x83, 0x2A, 0x80, 0x3A, +}; + +// /C=US/O=DigiCert Inc/OU=www.digicert.com/CN=DigiCert Transition RSA Root +// SHA256 Fingerprint: E5:2B:44:CD:1E:6A:9A:DA:0A:04:09:D1:CC:5D:73:A6 +// F4:17:60:3D:70:E6:F5:DC:54:83:AB:8A:DA:EF:3C:A4 +// https://crt.sh/?id=281399766 (crt.sh ID=281399766) +static const uint8_t CADigiCertTransitionRSARootSPKI[294] = { + 0x30, 0x82, 0x01, 0x22, 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, + 0x0D, 0x01, 0x01, 0x01, 0x05, 0x00, 0x03, 0x82, 0x01, 0x0F, 0x00, 0x30, 0x82, + 0x01, 0x0A, 0x02, 0x82, 0x01, 0x01, 0x00, 0xB0, 0x3E, 0xD8, 0x46, 0x63, 0x32, + 0xDF, 0x49, 0x1F, 0x61, 0x6D, 0xAE, 0xDF, 0xC9, 0x7F, 0x2B, 0xB1, 0x63, 0xA1, + 0xA7, 0xE6, 0x46, 0x35, 0x34, 0x0E, 0xD4, 0xA5, 0x3D, 0x12, 0xAF, 0x04, 0x6A, + 0xD5, 0xF8, 0xBA, 0xA7, 0x65, 0x93, 0xEC, 0x66, 0xC5, 0xCA, 0xEB, 0x68, 0x01, + 0x24, 0x69, 0x1F, 0xAF, 0xB0, 0xA3, 0x59, 0xAF, 0x3C, 0x5B, 0x39, 0x44, 0x29, + 0x60, 0x6E, 0x8B, 0x41, 0x98, 0x49, 0x21, 0xD8, 0x18, 0x13, 0xD3, 0x41, 0x55, + 0xFE, 0xAA, 0x22, 0x7E, 0xA7, 0x51, 0x4A, 0xA6, 0xD0, 0x23, 0x5F, 0x73, 0x84, + 0xA2, 0x9C, 0xB4, 0xCB, 0x17, 0xD0, 0x65, 0x24, 0x87, 0xE9, 0x80, 0xCB, 0xB7, + 0x3C, 0xA1, 0x10, 0xF5, 0x97, 0xB5, 0x0D, 0x9D, 0xEC, 0xF7, 0xBA, 0x5B, 0xA3, + 0x0B, 0x65, 0xEB, 0x12, 0x75, 0xA9, 0x46, 0x74, 0x0D, 0x80, 0xD7, 0x08, 0x13, + 0x93, 0x21, 0x57, 0xC6, 0x38, 0x3D, 0xA8, 0x4B, 0x3B, 0x0B, 0x6F, 0x18, 0xE5, + 0xB3, 0x4C, 0xF7, 0xC2, 0xCD, 0x18, 0xF9, 0x58, 0x2D, 0x03, 0x33, 0x1B, 0xFC, + 0x16, 0xDD, 0x90, 0x4E, 0xC2, 0x1F, 0x37, 0x9C, 0xD6, 0x7B, 0x61, 0x96, 0xF1, + 0xC5, 0x26, 0x87, 0x52, 0xE3, 0xE2, 0xA4, 0xF8, 0x15, 0xE5, 0x4C, 0x22, 0xE9, + 0x09, 0x2B, 0x95, 0xD1, 0x93, 0xF9, 0x3A, 0x39, 0x76, 0x74, 0x2A, 0x0B, 0x80, + 0xBE, 0xBE, 0x0E, 0xD3, 0x10, 0x0B, 0xE2, 0xE1, 0x48, 0xA6, 0x24, 0x05, 0x69, + 0x3D, 0x17, 0xFD, 0xC7, 0x37, 0x21, 0xB2, 0xB0, 0xE3, 0x77, 0x47, 0x39, 0x87, + 0x01, 0xE0, 0x4E, 0xDB, 0x23, 0xE8, 0xF9, 0x39, 0x9F, 0x36, 0x46, 0x66, 0x23, + 0x1E, 0xC7, 0x22, 0x51, 0x44, 0x3F, 0x33, 0xC5, 0xF5, 0x76, 0xA9, 0xF8, 0x06, + 0xB0, 0x79, 0xCC, 0xEE, 0x41, 0xDC, 0x71, 0x8E, 0x0D, 0x50, 0x8E, 0xB0, 0x3C, + 0x48, 0xAB, 0xF5, 0x02, 0x03, 0x01, 0x00, 0x01, +}; + static const DataAndLength RootAppleAndGoogleSPKIs[]= { - { CAGoogleInternetAuthorityG2SPKI, sizeof(CAGoogleInternetAuthorityG2SPKI) }, { CAGoogleInternetAuthorityG2SPKI, sizeof(CAGoogleInternetAuthorityG2SPKI) }, { CAAppleISTCA2G1SPKI, sizeof(CAAppleISTCA2G1SPKI) }, { CAAppleISTCA5G1SPKI, sizeof(CAAppleISTCA5G1SPKI) }, @@ -210,4 +300,8 @@ static const DataAndLength RootAppleAndGoogleSPKIs[]= { { CAAppleISTCA8G1SPKI, sizeof(CAAppleISTCA8G1SPKI) }, { CAAppleISTCA3G1SPKI, sizeof(CAAppleISTCA3G1SPKI) }, { CAAppleISTCA6G1SPKI, sizeof(CAAppleISTCA6G1SPKI) }, + { CADigiCertGlobalRootG2SPKI, sizeof(CADigiCertGlobalRootG2SPKI) }, + { CADigiCertGlobalRootG3SPKI, sizeof(CADigiCertGlobalRootG3SPKI) }, + { CADigiCertTransitionECCRootSPKI, sizeof(CADigiCertTransitionECCRootSPKI) }, + { CADigiCertTransitionRSARootSPKI, sizeof(CADigiCertTransitionRSARootSPKI) }, }; diff --git a/security/manager/ssl/nsNSSCallbacks.cpp b/security/manager/ssl/nsNSSCallbacks.cpp index f3b5acc53847..315d6010d791 100644 --- a/security/manager/ssl/nsNSSCallbacks.cpp +++ b/security/manager/ssl/nsNSSCallbacks.cpp @@ -38,7 +38,7 @@ #include "TrustOverrideUtils.h" #include "TrustOverride-SymantecData.inc" -#include "TrustOverride-AppleGoogleData.inc" +#include "TrustOverride-AppleGoogleDigiCertData.inc" #include "TrustOverride-TestImminentDistrustData.inc" using namespace mozilla;