Skip to content

Commit 66cb090

Browse files
committed
Remove deprecated Arduino trust anchor
1 parent 86f52c7 commit 66cb090

File tree

3 files changed

+5
-64
lines changed

3 files changed

+5
-64
lines changed

src/tls/AIoTCSSCert.h

-13
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,6 @@
3030
* CONSTANTS
3131
******************************************************************************/
3232
static const char AIoTSSCert[] =
33-
/* https://iot.arduino.cc:8883 */
34-
"-----BEGIN CERTIFICATE-----\n"
35-
"MIIBzzCCAXSgAwIBAgIUHxAd66fhJecnwaOR4+wNF03tSlkwCgYIKoZIzj0EAwIw\n"
36-
"RTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDkFyZHVpbm8gTExDIFVTMQswCQYDVQQL\n"
37-
"EwJJVDEQMA4GA1UEAxMHQXJkdWlubzAeFw0xODA3MjQwOTQ3MDBaFw00ODA3MTYw\n"
38-
"OTQ3MDBaMEUxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5BcmR1aW5vIExMQyBVUzEL\n"
39-
"MAkGA1UECxMCSVQxEDAOBgNVBAMTB0FyZHVpbm8wWTATBgcqhkjOPQIBBggqhkjO\n"
40-
"PQMBBwNCAARtd2xaz2EcfUSYUfJe4QJAd7ecvUmio4xOq16YrIL8aVtEIne0TS6O\n"
41-
"3ypxwTls1jkUvdlrGEtL7LPV7kKJiVUio0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYD\n"
42-
"VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUWz4qa47JsBqoVOY2m4wJ+fzhuYAwCgYI\n"
43-
"KoZIzj0EAwIDSQAwRgIhAL/T3CNmaLUK3D8NDsNz4grH92CqEA3TIL/hApabawXY\n"
44-
"AiEA6tnZ2lrNElKXCajtZg/hjWRE/+giFzBP8riar8qOz2w=\n"
45-
"-----END CERTIFICATE-----\n"
4633
/* https://iot.arduino.cc:8885 */
4734
"-----BEGIN CERTIFICATE-----\n"
4835
"MIIB0DCCAXagAwIBAgIUb62eK/Vv1baaPAaY5DADBUbxB1owCgYIKoZIzj0EAwIw\n"

src/tls/AIoTCUPCert.h

-13
Original file line numberDiff line numberDiff line change
@@ -135,19 +135,6 @@ static const char AIoTUPCert[] =
135135
"0q23KXB56jzaYyWf/Wi3MOxw+3WKt21gZ7IeyLnp2KhvAotnDU0mV3HaIPzBSlCN\n"
136136
"sSi6\n"
137137
"-----END CERTIFICATE-----\n"
138-
/* iot.arduino.cc:8883 / iot.oniudra.cc:8883 */
139-
"-----BEGIN CERTIFICATE-----\n"
140-
"MIIBzzCCAXSgAwIBAgIUHxAd66fhJecnwaOR4+wNF03tSlkwCgYIKoZIzj0EAwIw\n"
141-
"RTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDkFyZHVpbm8gTExDIFVTMQswCQYDVQQL\n"
142-
"EwJJVDEQMA4GA1UEAxMHQXJkdWlubzAeFw0xODA3MjQwOTQ3MDBaFw00ODA3MTYw\n"
143-
"OTQ3MDBaMEUxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5BcmR1aW5vIExMQyBVUzEL\n"
144-
"MAkGA1UECxMCSVQxEDAOBgNVBAMTB0FyZHVpbm8wWTATBgcqhkjOPQIBBggqhkjO\n"
145-
"PQMBBwNCAARtd2xaz2EcfUSYUfJe4QJAd7ecvUmio4xOq16YrIL8aVtEIne0TS6O\n"
146-
"3ypxwTls1jkUvdlrGEtL7LPV7kKJiVUio0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYD\n"
147-
"VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUWz4qa47JsBqoVOY2m4wJ+fzhuYAwCgYI\n"
148-
"KoZIzj0EAwIDSQAwRgIhAL/T3CNmaLUK3D8NDsNz4grH92CqEA3TIL/hApabawXY\n"
149-
"AiEA6tnZ2lrNElKXCajtZg/hjWRE/+giFzBP8riar8qOz2w=\n"
150-
"-----END CERTIFICATE--------\n"
151138
/* iot.arduino.cc:8885 */
152139
"-----BEGIN CERTIFICATE-----\n"
153140
"MIIB0DCCAXagAwIBAgIUb62eK/Vv1baaPAaY5DADBUbxB1owCgYIKoZIzj0EAwIw\n"

src/tls/BearSSLTrustAnchors.h

+5-38
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@
3737
//
3838
// brssl ta *.cer
3939

40-
//iot.arduino.cc:8883
41-
//iot.oniudra.cc:8883
40+
//iot.arduino.cc:8885
4241
static const unsigned char TA0_DN[] = {
4342
0x30, 0x45, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13,
4443
0x02, 0x55, 0x53, 0x31, 0x17, 0x30, 0x15, 0x06, 0x03, 0x55, 0x04, 0x0A,
@@ -49,25 +48,6 @@ static const unsigned char TA0_DN[] = {
4948
};
5049

5150
static const unsigned char TA0_EC_Q[] = {
52-
0x04, 0x6D, 0x77, 0x6C, 0x5A, 0xCF, 0x61, 0x1C, 0x7D, 0x44, 0x98, 0x51,
53-
0xF2, 0x5E, 0xE1, 0x02, 0x40, 0x77, 0xB7, 0x9C, 0xBD, 0x49, 0xA2, 0xA3,
54-
0x8C, 0x4E, 0xAB, 0x5E, 0x98, 0xAC, 0x82, 0xFC, 0x69, 0x5B, 0x44, 0x22,
55-
0x77, 0xB4, 0x4D, 0x2E, 0x8E, 0xDF, 0x2A, 0x71, 0xC1, 0x39, 0x6C, 0xD6,
56-
0x39, 0x14, 0xBD, 0xD9, 0x6B, 0x18, 0x4B, 0x4B, 0xEC, 0xB3, 0xD5, 0xEE,
57-
0x42, 0x89, 0x89, 0x55, 0x22
58-
};
59-
60-
//iot.arduino.cc:8885
61-
static const unsigned char TA1_DN[] = {
62-
0x30, 0x45, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13,
63-
0x02, 0x55, 0x53, 0x31, 0x17, 0x30, 0x15, 0x06, 0x03, 0x55, 0x04, 0x0A,
64-
0x13, 0x0E, 0x41, 0x72, 0x64, 0x75, 0x69, 0x6E, 0x6F, 0x20, 0x4C, 0x4C,
65-
0x43, 0x20, 0x55, 0x53, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04,
66-
0x0B, 0x13, 0x02, 0x49, 0x54, 0x31, 0x10, 0x30, 0x0E, 0x06, 0x03, 0x55,
67-
0x04, 0x03, 0x13, 0x07, 0x41, 0x72, 0x64, 0x75, 0x69, 0x6E, 0x6F
68-
};
69-
70-
static const unsigned char TA1_EC_Q[] = {
7151
0x04, 0xA1, 0xE1, 0x53, 0x6C, 0x35, 0x52, 0x1A, 0x33, 0x0D, 0xE8, 0x2B,
7252
0xAC, 0x5B, 0x12, 0xC1, 0x8F, 0x50, 0x37, 0xB3, 0x3E, 0x64, 0x9B, 0xA0,
7353
0xEE, 0x27, 0x02, 0x35, 0xC7, 0x8D, 0x5A, 0x10, 0x45, 0xD0, 0xCA, 0xF5,
@@ -77,7 +57,7 @@ static const unsigned char TA1_EC_Q[] = {
7757
};
7858

7959
//iot.oniudra.cc:8885
80-
static const unsigned char TA2_DN[] = {
60+
static const unsigned char TA1_DN[] = {
8161
0x30, 0x45, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13,
8262
0x02, 0x55, 0x53, 0x31, 0x17, 0x30, 0x15, 0x06, 0x03, 0x55, 0x04, 0x0A,
8363
0x13, 0x0E, 0x41, 0x72, 0x64, 0x75, 0x69, 0x6E, 0x6F, 0x20, 0x4C, 0x4C,
@@ -86,7 +66,7 @@ static const unsigned char TA2_DN[] = {
8666
0x04, 0x03, 0x13, 0x07, 0x41, 0x72, 0x64, 0x75, 0x69, 0x6E, 0x6F
8767
};
8868

89-
static const unsigned char TA2_EC_Q[] = {
69+
static const unsigned char TA1_EC_Q[] = {
9070
0x04, 0x11, 0x70, 0x34, 0xE0, 0xC3, 0x3E, 0x00, 0xBD, 0x0B, 0x59, 0x03,
9171
0x98, 0xA0, 0x5B, 0x6B, 0x0B, 0x50, 0xDF, 0x51, 0x66, 0x4E, 0xE7, 0x40,
9272
0x5D, 0x5A, 0x46, 0x48, 0xE5, 0x30, 0x70, 0x35, 0xF9, 0xF3, 0x6C, 0xFC,
@@ -95,7 +75,7 @@ static const unsigned char TA2_EC_Q[] = {
9575
0xAE, 0xA6, 0x4C, 0x06, 0x48
9676
};
9777

98-
static const br_x509_trust_anchor ArduinoIoTCloudTrustAnchor[3] = {
78+
static const br_x509_trust_anchor ArduinoIoTCloudTrustAnchor[2] = {
9979
{
10080
{ (unsigned char *)TA0_DN, sizeof TA0_DN },
10181
BR_X509_TA_CA,
@@ -121,23 +101,10 @@ static const br_x509_trust_anchor ArduinoIoTCloudTrustAnchor[3] = {
121101
}
122102
}
123103
}
124-
},
125-
{
126-
{ (unsigned char *)TA2_DN, sizeof TA2_DN },
127-
BR_X509_TA_CA,
128-
{
129-
BR_KEYTYPE_EC,
130-
{
131-
.ec = {
132-
BR_EC_secp256r1,
133-
(unsigned char *)TA2_EC_Q, sizeof TA2_EC_Q,
134-
}
135-
}
136-
}
137104
}
138105
};
139106

140-
#define ArduinoIoTCloudTrustAnchor_NUM (3)
107+
#define ArduinoIoTCloudTrustAnchor_NUM (2)
141108

142109
#endif /* #ifdef BOARD_HAS_ECCX08 */
143110

0 commit comments

Comments
 (0)