Skip to content

Commit c408fc4

Browse files
authored
Merge pull request #1381 from shadowguardian507-irl/AWS_CA_add
TLS(ca trust): Add Amazon Root CA 1 certificate to TLS component
2 parents 21a8dc7 + a9bc582 commit c408fc4

3 files changed

Lines changed: 5 additions & 1 deletion

File tree

vehicle/OVMS.V3/components/ovms_tls/component.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ ifdef CONFIG_MG_ENABLE_SSL
1111
COMPONENT_SRCDIRS := src
1212
COMPONENT_ADD_INCLUDEDIRS := src
1313
COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
14-
COMPONENT_EMBED_FILES := trustedca/usertrust.crt trustedca/digicert_global.crt trustedca/digicert_g2.crt trustedca/starfield_class2.crt trustedca/baltimore_cybertrust.crt trustedca/isrg_x1.crt
14+
COMPONENT_EMBED_FILES := trustedca/usertrust.crt trustedca/digicert_global.crt trustedca/digicert_g2.crt trustedca/starfield_class2.crt trustedca/baltimore_cybertrust.crt trustedca/isrg_x1.crt trustedca/amazon_root_ca1.crt
1515
endif

vehicle/OVMS.V3/components/ovms_tls/src/ovms_tls.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,10 @@ void OvmsTLS::Reload()
168168
extern const unsigned char isrg_x1_end[] asm("_binary_isrg_x1_crt_end");
169169
m_trustlist["ISRG X1 CA"] = new OvmsTrustedCert(isrg_x1, isrg_x1_end - isrg_x1);
170170

171+
extern const unsigned char amazon_root_ca1[] asm("_binary_amazon_root_ca1_crt_start");
172+
extern const unsigned char amazon_root_ca1_end[] asm("_binary_amazon_root_ca1_crt_end");
173+
m_trustlist["Amazon Root CA 1"] = new OvmsTrustedCert(amazon_root_ca1, amazon_root_ca1_end - amazon_root_ca1);
174+
171175
// Add trusted certs on disk (/store/trustedca)
172176
DIR *dir;
173177
struct dirent *dp;
837 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)