From fe877b6bb040eaf589eb1f8717a6d9f13eb75e94 Mon Sep 17 00:00:00 2001
From: Nejc Planinsek <planinseknejc@gmail.com>
Date: Sat, 23 Mar 2024 13:58:24 +0100
Subject: [PATCH] fixed icon download certificate

---
 Firmware/HomeButtonsArduino/src/config.h      |  2 +-
 .../HomeButtonsArduino/src/github_raw_cert.h  | 53 ++++++++-----------
 .../HomeButtonsArduino/src/mdi_helper.cpp     |  6 +--
 3 files changed, 27 insertions(+), 34 deletions(-)

diff --git a/Firmware/HomeButtonsArduino/src/config.h b/Firmware/HomeButtonsArduino/src/config.h
index fd83ba8..fc468c7 100644
--- a/Firmware/HomeButtonsArduino/src/config.h
+++ b/Firmware/HomeButtonsArduino/src/config.h
@@ -6,7 +6,7 @@
 
 // ------ device ------
 static constexpr char MANUFACTURER[] = "PLab";
-static constexpr char SW_VERSION[] = "v2.4.1";
+static constexpr char SW_VERSION[] = "v2.4.2";
 #ifndef HOME_BUTTONS_MINI
 static constexpr char SW_MODEL_ID[] = "A1";
 #else
diff --git a/Firmware/HomeButtonsArduino/src/github_raw_cert.h b/Firmware/HomeButtonsArduino/src/github_raw_cert.h
index 55b6ce0..0f9a64b 100644
--- a/Firmware/HomeButtonsArduino/src/github_raw_cert.h
+++ b/Firmware/HomeButtonsArduino/src/github_raw_cert.h
@@ -5,38 +5,31 @@
 
 namespace github_raw_cert {
 
-// http://cacerts.digicert.com/DigiCertTLSRSASHA2562020CA1-1.crt
-// CN: DigiCert TLS RSA SHA256 2020 CA1 => name:
-// DigiCert_TLS_RSA_SHA256_2020_CA1 not valid before: 2021-04-14 00:00:00 not
-// valid after:  2031-04-13 23:59:59
-const char cert_DigiCert_TLS_RSA_SHA256_2020_CA1[] PROGMEM = R"CERT(
+// DigiCert Global Root G2
+// http://cacerts.digicert.com/DigiCertGlobalRootG2.crt
+// Valid until: 15/Jan/2038
+const char DigiCert_Global_Root_G2[] PROGMEM = R"CERT(
 -----BEGIN CERTIFICATE-----
-MIIEvjCCA6agAwIBAgIQBtjZBNVYQ0b2ii+nVCJ+xDANBgkqhkiG9w0BAQsFADBh
+MIIDjjCCAnagAwIBAgIQAzrx5qcRqaC7KGSxHQn65TANBgkqhkiG9w0BAQsFADBh
 MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD
-QTAeFw0yMTA0MTQwMDAwMDBaFw0zMTA0MTMyMzU5NTlaME8xCzAJBgNVBAYTAlVT
-MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxKTAnBgNVBAMTIERpZ2lDZXJ0IFRMUyBS
-U0EgU0hBMjU2IDIwMjAgQ0ExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAwUuzZUdwvN1PWNvsnO3DZuUfMRNUrUpmRh8sCuxkB+Uu3Ny5CiDt3+PE0J6a
-qXodgojlEVbbHp9YwlHnLDQNLtKS4VbL8Xlfs7uHyiUDe5pSQWYQYE9XE0nw6Ddn
-g9/n00tnTCJRpt8OmRDtV1F0JuJ9x8piLhMbfyOIJVNvwTRYAIuE//i+p1hJInuW
-raKImxW8oHzf6VGo1bDtN+I2tIJLYrVJmuzHZ9bjPvXj1hJeRPG/cUJ9WIQDgLGB
-Afr5yjK7tI4nhyfFK3TUqNaX3sNk+crOU6JWvHgXjkkDKa77SU+kFbnO8lwZV21r
-eacroicgE7XQPUDTITAHk+qZ9QIDAQABo4IBgjCCAX4wEgYDVR0TAQH/BAgwBgEB
-/wIBADAdBgNVHQ4EFgQUt2ui6qiqhIx56rTaD5iyxZV2ufQwHwYDVR0jBBgwFoAU
-A95QNVbRTLtm8KPiGxvDl7I90VUwDgYDVR0PAQH/BAQDAgGGMB0GA1UdJQQWMBQG
-CCsGAQUFBwMBBggrBgEFBQcDAjB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUHMAGG
-GGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBABggrBgEFBQcwAoY0aHR0cDovL2Nh
-Y2VydHMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0R2xvYmFsUm9vdENBLmNydDBCBgNV
-HR8EOzA5MDegNaAzhjFodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vRGlnaUNlcnRH
-bG9iYWxSb290Q0EuY3JsMD0GA1UdIAQ2MDQwCwYJYIZIAYb9bAIBMAcGBWeBDAEB
-MAgGBmeBDAECATAIBgZngQwBAgIwCAYGZ4EMAQIDMA0GCSqGSIb3DQEBCwUAA4IB
-AQCAMs5eC91uWg0Kr+HWhMvAjvqFcO3aXbMM9yt1QP6FCvrzMXi3cEsaiVi6gL3z
-ax3pfs8LulicWdSQ0/1s/dCYbbdxglvPbQtaCdB73sRD2Cqk3p5BJl+7j5nL3a7h
-qG+fh/50tx8bIKuxT8b1Z11dmzzp/2n3YWzW2fP9NsarA4h20ksudYbj/NhVfSbC
-EXffPgK2fPOre3qGNm+499iTcc+G33Mw+nur7SpZyEKEOxEXGlLzyQ4UfaJbcme6
-ce1XR2bFuAJKZTRei9AqPCCcUZlM51Ke92sRKw2Sfh3oius2FkOH6ipjv3U/697E
-A7sKPPcw7+uvTPyLNhBzPvOk
+d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBH
+MjAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAwMDBaMGExCzAJBgNVBAYTAlVT
+MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
+b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcyMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuzfNNNx7a8myaJCtSnX/RrohCgiN9RlUyfuI
+2/Ou8jqJkTx65qsGGmvPrC3oXgkkRLpimn7Wo6h+4FR1IAWsULecYxpsMNzaHxmx
+1x7e/dfgy5SDN67sH0NO3Xss0r0upS/kqbitOtSZpLYl6ZtrAGCSYP9PIUkY92eQ
+q2EGnI/yuum06ZIya7XzV+hdG82MHauVBJVJ8zUtluNJbd134/tJS7SsVQepj5Wz
+tCO7TG1F8PapspUwtP1MVYwnSlcUfIKdzXOS0xZKBgyMUNGPHgm+F6HmIcr9g+UQ
+vIOlCsRnKPZzFBQ9RnbDhxSJITRNrw9FDKZJobq7nMWxM4MphQIDAQABo0IwQDAP
+BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUTiJUIBiV
+5uNu5g/6+rkS7QYXjzkwDQYJKoZIhvcNAQELBQADggEBAGBnKJRvDkhj6zHd6mcY
+1Yl9PMWLSn/pvtsrF9+wX3N3KjITOYFnQoQj8kVnNeyIv/iPsGEMNKSuIEyExtv4
+NeF22d+mQrvHRAiGfzZ0JFrabA0UWTW98kndth/Jsw1HKj2ZL7tcu7XUIOGZX1NG
+Fdtom/DzMNU+MeKNhJ7jitralj41E6Vf8PlwUHBHQRFXGU7Aj64GxJUTFy8bJZ91
+8rGOmaFvE7FBcf6IKshPECBV1/MUReXgRPTqh5Uykw7+U0b6LJ3/iyK5S9kJRaTe
+pLiaWN0bfVKfjllDiIGknibVb63dDcY3fe0Dkhvld1927jyNxF1WW6LZZm6zNTfl
+MrY=
 -----END CERTIFICATE-----
   )CERT";
 
diff --git a/Firmware/HomeButtonsArduino/src/mdi_helper.cpp b/Firmware/HomeButtonsArduino/src/mdi_helper.cpp
index dc99712..7f7581a 100644
--- a/Firmware/HomeButtonsArduino/src/mdi_helper.cpp
+++ b/Firmware/HomeButtonsArduino/src/mdi_helper.cpp
@@ -50,8 +50,8 @@ StaticString<MAX_PATH_LEN> MDIHelper::_get_path(const char* name,
 }
 
 bool MDIHelper::check_connection() {
-  return download::check_connection(
-      HOST, TEST_URL, github_raw_cert::cert_DigiCert_TLS_RSA_SHA256_2020_CA1);
+  return download::check_connection(HOST, TEST_URL,
+                                    github_raw_cert::DigiCert_Global_Root_G2);
 }
 
 bool MDIHelper::download(const char* name, uint16_t size) {
@@ -78,7 +78,7 @@ bool MDIHelper::download(const char* name, uint16_t size) {
   StaticString<256> url("%s%dx%d/%s.bmp", MDI_URL, size, size, name);
   bool ret = download::download_file_https(
       HOST, url.c_str(), file,
-      github_raw_cert::cert_DigiCert_TLS_RSA_SHA256_2020_CA1);
+      github_raw_cert::DigiCert_Global_Root_G2);
   if (ret) {
     info("Downloaded '%s' size: %d", name, size);
     return true;