Memfault Firmware SDK 1.3.0 (Build 3558)

Author: Memfault Inc

CHANGES.md

@@ -1,5 +1,20 @@
 # Memfault Firmware SDK Changelog
 
+## 1.3.0 - Sept 20, 2023
+
+### :chart_with_upwards_trend: Improvements
+
+- General:
+  - Remove an unused root certificate and adjust the order of certs to minimize
+    additional TLS handshakes; DigiCert G2 is the most likely root cert so it is
+    now the first one attempted in every place certificates are used. This
+    update is trickled down from
+    [DigiCert's pivot in March 2023](https://knowledge.digicert.com/generalinformation/digicert-root-and-intermediate-ca-certificate-updates-2023.html)
+    to their G2 root cert as their default certificate.
+- Zephyr:
+  - Add support for the new location of the `nmi.h` header which
+    [moved recently](https://github.com/zephyrproject-rtos/zephyr/pull/60031).
+
 ## 1.2.5 - Sept 18, 2023
 
 ### :chart_with_upwards_trend: Improvements

VERSION

@@ -1,2 +1,3 @@
-BUILD ID: 3530
-GIT COMMIT: 9d31ca353
+BUILD ID: 3558
+GIT COMMIT: 597c76e06
+VERSION: 1.3.0

components/http/src/memfault_root_certs_der.c

@@ -172,84 +172,6 @@ const uint8_t g_memfault_cert_digicert_global_root_g2[] = {
   0x32, 0xb6
 };
 
-const uint8_t g_memfault_cert_baltimore_cybertrust_root[] = {
-  0x30, 0x82, 0x03, 0x77, 0x30, 0x82, 0x02, 0x5f, 0xa0, 0x03, 0x02, 0x01,
-  0x02, 0x02, 0x04, 0x02, 0x00, 0x00, 0xb9, 0x30, 0x0d, 0x06, 0x09, 0x2a,
-  0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x05, 0x05, 0x00, 0x30, 0x5a,
-  0x31, 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x49,
-  0x45, 0x31, 0x12, 0x30, 0x10, 0x06, 0x03, 0x55, 0x04, 0x0a, 0x13, 0x09,
-  0x42, 0x61, 0x6c, 0x74, 0x69, 0x6d, 0x6f, 0x72, 0x65, 0x31, 0x13, 0x30,
-  0x11, 0x06, 0x03, 0x55, 0x04, 0x0b, 0x13, 0x0a, 0x43, 0x79, 0x62, 0x65,
-  0x72, 0x54, 0x72, 0x75, 0x73, 0x74, 0x31, 0x22, 0x30, 0x20, 0x06, 0x03,
-  0x55, 0x04, 0x03, 0x13, 0x19, 0x42, 0x61, 0x6c, 0x74, 0x69, 0x6d, 0x6f,
-  0x72, 0x65, 0x20, 0x43, 0x79, 0x62, 0x65, 0x72, 0x54, 0x72, 0x75, 0x73,
-  0x74, 0x20, 0x52, 0x6f, 0x6f, 0x74, 0x30, 0x1e, 0x17, 0x0d, 0x30, 0x30,
-  0x30, 0x35, 0x31, 0x32, 0x31, 0x38, 0x34, 0x36, 0x30, 0x30, 0x5a, 0x17,
-  0x0d, 0x32, 0x35, 0x30, 0x35, 0x31, 0x32, 0x32, 0x33, 0x35, 0x39, 0x30,
-  0x30, 0x5a, 0x30, 0x5a, 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04,
-  0x06, 0x13, 0x02, 0x49, 0x45, 0x31, 0x12, 0x30, 0x10, 0x06, 0x03, 0x55,
-  0x04, 0x0a, 0x13, 0x09, 0x42, 0x61, 0x6c, 0x74, 0x69, 0x6d, 0x6f, 0x72,
-  0x65, 0x31, 0x13, 0x30, 0x11, 0x06, 0x03, 0x55, 0x04, 0x0b, 0x13, 0x0a,
-  0x43, 0x79, 0x62, 0x65, 0x72, 0x54, 0x72, 0x75, 0x73, 0x74, 0x31, 0x22,
-  0x30, 0x20, 0x06, 0x03, 0x55, 0x04, 0x03, 0x13, 0x19, 0x42, 0x61, 0x6c,
-  0x74, 0x69, 0x6d, 0x6f, 0x72, 0x65, 0x20, 0x43, 0x79, 0x62, 0x65, 0x72,
-  0x54, 0x72, 0x75, 0x73, 0x74, 0x20, 0x52, 0x6f, 0x6f, 0x74, 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, 0xa3, 0x04, 0xbb, 0x22, 0xab,
-  0x98, 0x3d, 0x57, 0xe8, 0x26, 0x72, 0x9a, 0xb5, 0x79, 0xd4, 0x29, 0xe2,
-  0xe1, 0xe8, 0x95, 0x80, 0xb1, 0xb0, 0xe3, 0x5b, 0x8e, 0x2b, 0x29, 0x9a,
-  0x64, 0xdf, 0xa1, 0x5d, 0xed, 0xb0, 0x09, 0x05, 0x6d, 0xdb, 0x28, 0x2e,
-  0xce, 0x62, 0xa2, 0x62, 0xfe, 0xb4, 0x88, 0xda, 0x12, 0xeb, 0x38, 0xeb,
-  0x21, 0x9d, 0xc0, 0x41, 0x2b, 0x01, 0x52, 0x7b, 0x88, 0x77, 0xd3, 0x1c,
-  0x8f, 0xc7, 0xba, 0xb9, 0x88, 0xb5, 0x6a, 0x09, 0xe7, 0x73, 0xe8, 0x11,
-  0x40, 0xa7, 0xd1, 0xcc, 0xca, 0x62, 0x8d, 0x2d, 0xe5, 0x8f, 0x0b, 0xa6,
-  0x50, 0xd2, 0xa8, 0x50, 0xc3, 0x28, 0xea, 0xf5, 0xab, 0x25, 0x87, 0x8a,
-  0x9a, 0x96, 0x1c, 0xa9, 0x67, 0xb8, 0x3f, 0x0c, 0xd5, 0xf7, 0xf9, 0x52,
-  0x13, 0x2f, 0xc2, 0x1b, 0xd5, 0x70, 0x70, 0xf0, 0x8f, 0xc0, 0x12, 0xca,
-  0x06, 0xcb, 0x9a, 0xe1, 0xd9, 0xca, 0x33, 0x7a, 0x77, 0xd6, 0xf8, 0xec,
-  0xb9, 0xf1, 0x68, 0x44, 0x42, 0x48, 0x13, 0xd2, 0xc0, 0xc2, 0xa4, 0xae,
-  0x5e, 0x60, 0xfe, 0xb6, 0xa6, 0x05, 0xfc, 0xb4, 0xdd, 0x07, 0x59, 0x02,
-  0xd4, 0x59, 0x18, 0x98, 0x63, 0xf5, 0xa5, 0x63, 0xe0, 0x90, 0x0c, 0x7d,
-  0x5d, 0xb2, 0x06, 0x7a, 0xf3, 0x85, 0xea, 0xeb, 0xd4, 0x03, 0xae, 0x5e,
-  0x84, 0x3e, 0x5f, 0xff, 0x15, 0xed, 0x69, 0xbc, 0xf9, 0x39, 0x36, 0x72,
-  0x75, 0xcf, 0x77, 0x52, 0x4d, 0xf3, 0xc9, 0x90, 0x2c, 0xb9, 0x3d, 0xe5,
-  0xc9, 0x23, 0x53, 0x3f, 0x1f, 0x24, 0x98, 0x21, 0x5c, 0x07, 0x99, 0x29,
-  0xbd, 0xc6, 0x3a, 0xec, 0xe7, 0x6e, 0x86, 0x3a, 0x6b, 0x97, 0x74, 0x63,
-  0x33, 0xbd, 0x68, 0x18, 0x31, 0xf0, 0x78, 0x8d, 0x76, 0xbf, 0xfc, 0x9e,
-  0x8e, 0x5d, 0x2a, 0x86, 0xa7, 0x4d, 0x90, 0xdc, 0x27, 0x1a, 0x39, 0x02,
-  0x03, 0x01, 0x00, 0x01, 0xa3, 0x45, 0x30, 0x43, 0x30, 0x1d, 0x06, 0x03,
-  0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0xe5, 0x9d, 0x59, 0x30, 0x82,
-  0x47, 0x58, 0xcc, 0xac, 0xfa, 0x08, 0x54, 0x36, 0x86, 0x7b, 0x3a, 0xb5,
-  0x04, 0x4d, 0xf0, 0x30, 0x12, 0x06, 0x03, 0x55, 0x1d, 0x13, 0x01, 0x01,
-  0xff, 0x04, 0x08, 0x30, 0x06, 0x01, 0x01, 0xff, 0x02, 0x01, 0x03, 0x30,
-  0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff, 0x04, 0x04, 0x03,
-  0x02, 0x01, 0x06, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7,
-  0x0d, 0x01, 0x01, 0x05, 0x05, 0x00, 0x03, 0x82, 0x01, 0x01, 0x00, 0x85,
-  0x0c, 0x5d, 0x8e, 0xe4, 0x6f, 0x51, 0x68, 0x42, 0x05, 0xa0, 0xdd, 0xbb,
-  0x4f, 0x27, 0x25, 0x84, 0x03, 0xbd, 0xf7, 0x64, 0xfd, 0x2d, 0xd7, 0x30,
-  0xe3, 0xa4, 0x10, 0x17, 0xeb, 0xda, 0x29, 0x29, 0xb6, 0x79, 0x3f, 0x76,
-  0xf6, 0x19, 0x13, 0x23, 0xb8, 0x10, 0x0a, 0xf9, 0x58, 0xa4, 0xd4, 0x61,
-  0x70, 0xbd, 0x04, 0x61, 0x6a, 0x12, 0x8a, 0x17, 0xd5, 0x0a, 0xbd, 0xc5,
-  0xbc, 0x30, 0x7c, 0xd6, 0xe9, 0x0c, 0x25, 0x8d, 0x86, 0x40, 0x4f, 0xec,
-  0xcc, 0xa3, 0x7e, 0x38, 0xc6, 0x37, 0x11, 0x4f, 0xed, 0xdd, 0x68, 0x31,
-  0x8e, 0x4c, 0xd2, 0xb3, 0x01, 0x74, 0xee, 0xbe, 0x75, 0x5e, 0x07, 0x48,
-  0x1a, 0x7f, 0x70, 0xff, 0x16, 0x5c, 0x84, 0xc0, 0x79, 0x85, 0xb8, 0x05,
-  0xfd, 0x7f, 0xbe, 0x65, 0x11, 0xa3, 0x0f, 0xc0, 0x02, 0xb4, 0xf8, 0x52,
-  0x37, 0x39, 0x04, 0xd5, 0xa9, 0x31, 0x7a, 0x18, 0xbf, 0xa0, 0x2a, 0xf4,
-  0x12, 0x99, 0xf7, 0xa3, 0x45, 0x82, 0xe3, 0x3c, 0x5e, 0xf5, 0x9d, 0x9e,
-  0xb5, 0xc8, 0x9e, 0x7c, 0x2e, 0xc8, 0xa4, 0x9e, 0x4e, 0x08, 0x14, 0x4b,
-  0x6d, 0xfd, 0x70, 0x6d, 0x6b, 0x1a, 0x63, 0xbd, 0x64, 0xe6, 0x1f, 0xb7,
-  0xce, 0xf0, 0xf2, 0x9f, 0x2e, 0xbb, 0x1b, 0xb7, 0xf2, 0x50, 0x88, 0x73,
-  0x92, 0xc2, 0xe2, 0xe3, 0x16, 0x8d, 0x9a, 0x32, 0x02, 0xab, 0x8e, 0x18,
-  0xdd, 0xe9, 0x10, 0x11, 0xee, 0x7e, 0x35, 0xab, 0x90, 0xaf, 0x3e, 0x30,
-  0x94, 0x7a, 0xd0, 0x33, 0x3d, 0xa7, 0x65, 0x0f, 0xf5, 0xfc, 0x8e, 0x9e,
-  0x62, 0xcf, 0x47, 0x44, 0x2c, 0x01, 0x5d, 0xbb, 0x1d, 0xb5, 0x32, 0xd2,
-  0x47, 0xd2, 0x38, 0x2e, 0xd0, 0xfe, 0x81, 0xdc, 0x32, 0x6a, 0x1e, 0xb5,
-  0xee, 0x3c, 0xd5, 0xfc, 0xe7, 0x81, 0x1d, 0x19, 0xc3, 0x24, 0x42, 0xea,
-  0x63, 0x39, 0xa9
-};
-
 const uint8_t g_memfault_cert_amazon_root_ca1[] = {
   0x30, 0x82, 0x03, 0x41, 0x30, 0x82, 0x02, 0x29, 0xa0, 0x03, 0x02, 0x01,
   0x02, 0x02, 0x13, 0x06, 0x6c, 0x9f, 0xcf, 0x99, 0xbf, 0x8c, 0x0a, 0x39,
@@ -325,5 +247,4 @@ const uint8_t g_memfault_cert_amazon_root_ca1[] = {
 
 const size_t g_memfault_cert_digicert_global_root_ca_len = sizeof(g_memfault_cert_digicert_global_root_ca);
 const size_t g_memfault_cert_digicert_global_root_g2_len = sizeof(g_memfault_cert_digicert_global_root_g2);
-const size_t g_memfault_cert_baltimore_cybertrust_root_len = sizeof(g_memfault_cert_baltimore_cybertrust_root);
 const size_t g_memfault_cert_amazon_root_ca1_len = sizeof(g_memfault_cert_amazon_root_ca1);

components/include/memfault/http/root_certs.h

@@ -68,30 +68,6 @@ extern "C" {
   "MrY=\n"                                                             \
   "-----END CERTIFICATE-----\n"
 
-//! Baltimore CyberTrust Root. Valid until 2025-05-12.
-#define MEMFAULT_ROOT_CERTS_BALTIMORE_CYBERTRUST_ROOT                  \
-  "-----BEGIN CERTIFICATE-----\n"                                      \
-  "MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJ\n" \
-  "RTESMBAGA1UEChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYD\n" \
-  "VQQDExlCYWx0aW1vcmUgQ3liZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoX\n" \
-  "DTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMCSUUxEjAQBgNVBAoTCUJhbHRpbW9y\n" \
-  "ZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFsdGltb3JlIEN5YmVy\n" \
-  "VHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKMEuyKr\n" \
-  "mD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjr\n" \
-  "IZ3AQSsBUnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeK\n" \
-  "mpYcqWe4PwzV9/lSEy/CG9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSu\n" \
-  "XmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9XbIGevOF6uvUA65ehD5f/xXtabz5OTZy\n" \
-  "dc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjprl3RjM71oGDHweI12v/ye\n" \
-  "jl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoIVDaGezq1\n" \
-  "BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3\n" \
-  "DQEBBQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT92\n" \
-  "9hkTI7gQCvlYpNRhcL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3Wgx\n" \
-  "jkzSswF07r51XgdIGn9w/xZchMB5hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0\n" \
-  "Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsaY71k5h+3zvDyny67G7fyUIhz\n" \
-  "ksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9HRCwBXbsdtTLS\n" \
-  "R9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp\n"                             \
-  "-----END CERTIFICATE-----\n"
-
 //! Amazon Root CA 1. Valid until 2038-01-17.
 #define MEMFAULT_ROOT_CERTS_AMAZON_ROOT_CA1                            \
   "-----BEGIN CERTIFICATE-----\n"                                      \
@@ -115,19 +91,17 @@ extern "C" {
   "rqXRfboQnoZsG4q5WTP468SQvvG5\n"                                     \
   "-----END CERTIFICATE-----\n"
 
-#define MEMFAULT_ROOT_CERTS_PEM                 \
-  MEMFAULT_ROOT_CERTS_DIGICERT_GLOBAL_ROOT_CA   \
-  MEMFAULT_ROOT_CERTS_DIGICERT_GLOBAL_ROOT_G2   \
-  MEMFAULT_ROOT_CERTS_BALTIMORE_CYBERTRUST_ROOT \
-  MEMFAULT_ROOT_CERTS_AMAZON_ROOT_CA1
+// In decreasing order of likelihood of success
+#define MEMFAULT_ROOT_CERTS_PEM               \
+  MEMFAULT_ROOT_CERTS_DIGICERT_GLOBAL_ROOT_G2 \
+  MEMFAULT_ROOT_CERTS_AMAZON_ROOT_CA1         \
+  MEMFAULT_ROOT_CERTS_DIGICERT_GLOBAL_ROOT_CA
 
 // The certs are also available in their binary DER format via
 extern const uint8_t g_memfault_cert_digicert_global_root_ca[];
 extern const size_t g_memfault_cert_digicert_global_root_ca_len;
 extern const uint8_t g_memfault_cert_digicert_global_root_g2[];
 extern const size_t g_memfault_cert_digicert_global_root_g2_len;
-extern const uint8_t g_memfault_cert_baltimore_cybertrust_root[];
-extern const size_t g_memfault_cert_baltimore_cybertrust_root_len;
 extern const uint8_t g_memfault_cert_amazon_root_ca1[];
 extern const size_t g_memfault_cert_amazon_root_ca1_len;
 

components/include/memfault/version.h

@@ -19,8 +19,8 @@ typedef struct {
   uint8_t patch;
 } sMfltSdkVersion;
 
-#define MEMFAULT_SDK_VERSION   { .major = 1, .minor = 2, .patch = 5 }
-#define MEMFAULT_SDK_VERSION_STR "1.2.5"
+#define MEMFAULT_SDK_VERSION   { .major = 1, .minor = 3, .patch = 0 }
+#define MEMFAULT_SDK_VERSION_STR "1.3.0"
 
 #ifdef __cplusplus
 }

examples/nrf-connect-sdk/nrf5/memfault_demo_app/src/main.c

@@ -99,7 +99,7 @@ static void prv_start_watchdog_feed_thread(void) {
   k_thread_start(wd_feed_thread);
 }
 
-void main(void) {
+int main(void) {
   LOG_INF("Booting Memfault sample app!");
 
   // Set the device id based on the hardware UID
@@ -108,4 +108,6 @@ void main(void) {
   memfault_device_info_dump();
 
   prv_start_watchdog_feed_thread();
+
+  return 0;
 }

examples/nrf5/README.md

@@ -273,10 +273,10 @@ look like and has been tested with nRF SDK v15.2.0.
 ```
 // main.c
 
-void main(void) {
+int main(void) {
   [... other initialization code ...]
   memfault_platform_boot();
-}
+  [... application code ...]
 ```
 
 - If your project doesn't already include them you may need to add a few files

examples/zephyr/qemu/qemu-app/src/main.c

@@ -192,7 +192,7 @@ static void prv_run_stack_metrics_example(void) {
 }
 #endif  // CONFIG_ZEPHYR_MEMFAULT_EXAMPLE_MEMORY_METRICS
 
-void main(void) {
+int main(void) {
   LOG_INF("👋 Memfault Demo App! Board %s\n", CONFIG_BOARD);
   memfault_device_info_dump();
 
@@ -216,4 +216,6 @@ void main(void) {
   prv_init_test_thread_timer();
 
   blink_forever();
+
+  return 0;
 }

examples/zephyr/stm32l4_disco/apps/memfault_demo_app/src/main.c

@@ -29,8 +29,10 @@ void memfault_platform_get_device_info(sMemfaultDeviceInfo *info) {
   };
 }
 
-void main(void) {
+int main(void) {
   LOG_INF("Memfault Demo App! Board %s\n", CONFIG_BOARD);
   memfault_device_info_dump();
   memfault_zephyr_port_install_root_certs();
+
+  return 0;
 }

ports/esp8266_sdk/memfault/memfault_platform_http_client.c

@@ -120,9 +120,8 @@ sMfltHttpClient *memfault_platform_http_client_create(void) {
 
   const char *memfault_root_certs[] = {
     MEMFAULT_ROOT_CERTS_DIGICERT_GLOBAL_ROOT_G2,
-    MEMFAULT_ROOT_CERTS_DIGICERT_GLOBAL_ROOT_CA,
-    MEMFAULT_ROOT_CERTS_BALTIMORE_CYBERTRUST_ROOT,
-    MEMFAULT_ROOT_CERTS_AMAZON_ROOT_CA1
+    MEMFAULT_ROOT_CERTS_AMAZON_ROOT_CA1,
+    MEMFAULT_ROOT_CERTS_DIGICERT_GLOBAL_ROOT_CA
   };
 
   esp_http_client_handle_t client = NULL;