From 40babf79515465aa03b4e851a435c3966aa3c1df Mon Sep 17 00:00:00 2001 From: RoSchmi Date: Tue, 2 Nov 2021 14:52:38 +0100 Subject: [PATCH] Added DigiCert Global Root G2 to code, not yet activated --- include/config.h | 31 +++++++++++++++++++++++++++++++ src/main.cpp | 6 +++++- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/include/config.h b/include/config.h index 98a1a67..135208f 100644 --- a/include/config.h +++ b/include/config.h @@ -119,7 +119,38 @@ #define SENSOR_3_FAHRENHEIT 0 // 1 = yes, 0 = no - Display in Fahrenheit scale #define SENSOR_4_FAHRENHEIT 0 // 1 = yes, 0 = no - Display in Fahrenheit scale +//-https://techcommunity.microsoft.com/t5/azure-storage/azure-storage-tls-critical-changes-are-almost-here-and-why-you/ba-p/2741581 +// +// +// To continue without disruption due to this change, +// Microsoft recommends that client applications or devices +// trust the root CA – DigiCert Global Root G2: +// DigiCert Global Root G2 +// (Thumbprint: df3c24f9bfd666761b268073fe06d1cc8d4f82a4) +const char *digicert_globalroot_g2_ca = +"-----BEGIN CERTIFICATE-----\n" +"MIIDjjCCAnagAwIBAgIQAzrx5qcRqaC7KGSxHQn65TANBgkqhkiG9w0BAQsFADBh\n" +"MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3\n" +"d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBH\n" +"MjAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAwMDBaMGExCzAJBgNVBAYTAlVT\n" +"MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j\n" +"b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcyMIIBIjANBgkqhkiG\n" +"9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuzfNNNx7a8myaJCtSnX/RrohCgiN9RlUyfuI\n" +"2/Ou8jqJkTx65qsGGmvPrC3oXgkkRLpimn7Wo6h+4FR1IAWsULecYxpsMNzaHxmx\n" +"1x7e/dfgy5SDN67sH0NO3Xss0r0upS/kqbitOtSZpLYl6ZtrAGCSYP9PIUkY92eQ\n" +"q2EGnI/yuum06ZIya7XzV+hdG82MHauVBJVJ8zUtluNJbd134/tJS7SsVQepj5Wz\n" +"tCO7TG1F8PapspUwtP1MVYwnSlcUfIKdzXOS0xZKBgyMUNGPHgm+F6HmIcr9g+UQ\n" +"vIOlCsRnKPZzFBQ9RnbDhxSJITRNrw9FDKZJobq7nMWxM4MphQIDAQABo0IwQDAP\n" +"BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUTiJUIBiV\n" +"5uNu5g/6+rkS7QYXjzkwDQYJKoZIhvcNAQELBQADggEBAGBnKJRvDkhj6zHd6mcY\n" +"1Yl9PMWLSn/pvtsrF9+wX3N3KjITOYFnQoQj8kVnNeyIv/iPsGEMNKSuIEyExtv4\n" +"NeF22d+mQrvHRAiGfzZ0JFrabA0UWTW98kndth/Jsw1HKj2ZL7tcu7XUIOGZX1NG\n" +"Fdtom/DzMNU+MeKNhJ7jitralj41E6Vf8PlwUHBHQRFXGU7Aj64GxJUTFy8bJZ91\n" +"8rGOmaFvE7FBcf6IKshPECBV1/MUReXgRPTqh5Uykw7+U0b6LJ3/iyK5S9kJRaTe\n" +"pLiaWN0bfVKfjllDiIGknibVb63dDcY3fe0Dkhvld1927jyNxF1WW6LZZm6zNTfl\n" +"MrY=\n" +"-----END CERTIFICATE-----"; const char *baltimore_root_ca = "-----BEGIN CERTIFICATE-----\n" diff --git a/src/main.cpp b/src/main.cpp index 11c743c..eda1b55 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,4 +1,4 @@ -// Program 'Esp32_WiFiManager_HeatingSurvey' +// Program 'Esp32_WiFiManager_HeatingSurvey // Copyright: RoSchmi 2021, License: Apache 2.0 // This App for Esp32 monitors the activity of the burner of an oil-heating @@ -128,8 +128,12 @@ const bool augmentTableNameWithYear = true; typedef const char* X509Certificate; +// https://techcommunity.microsoft.com/t5/azure-storage/azure-storage-tls-critical-changes-are-almost-here-and-why-you/ba-p/2741581 +// baltimore_root_ca will expire in 2025, then take digicert_globalroot_g2_ca X509Certificate myX509Certificate = baltimore_root_ca; +//X509Certificate myX509Certificate = digicert_globalroot_g2_ca; + // Init the Secure client object #if TRANSPORT_PROTOCOL == 1