From b28fbcddb585a6dc519d695fa9b42d7255944f0b Mon Sep 17 00:00:00 2001
From: RLeclair <raulleclair@microsoft.com>
Date: Fri, 23 Sep 2022 18:56:20 +0000
Subject: [PATCH] Add DigiCertGlobalRootG2 and
 MicrosoftRSARootCertificateAuthority2017 as trust anchor

---
 extras/TrustAnchors/DigiCertGlobalRootG2.cer  | Bin 0 -> 914 bytes
 ...crosoftRSARootCertificateAuthority2017.cer | Bin 0 -> 1452 bytes
 src/BearSSLTrustAnchors.h                     | 261 +++++++++++++-----
 3 files changed, 193 insertions(+), 68 deletions(-)
 create mode 100644 extras/TrustAnchors/DigiCertGlobalRootG2.cer
 create mode 100644 extras/TrustAnchors/MicrosoftRSARootCertificateAuthority2017.cer

diff --git a/extras/TrustAnchors/DigiCertGlobalRootG2.cer b/extras/TrustAnchors/DigiCertGlobalRootG2.cer
new file mode 100644
index 0000000000000000000000000000000000000000..1e927a7afe06c270670d6bc25c4d465db2e0a7e8
GIT binary patch
literal 914
zcmXqLV(v3&Vk%p}%*4pVB*1L-@!4|0l?!%jq->Ps{Pom;myJ`a&7<u*FC!y2D}zCz
zA-4f18*?ZNn=n&ou%W1dFo?q?%;S=op6Q%gRHERSmux6$APy4d78WQkFV{-}N+koO
z^pf*)4HXRJKvK-Y;&2`AIr&M6ISN7f`6UYOMh0@?yoSaG76yifMg~9-CC+OM;+R6Y
z^l(BGqY|>m8Ce;an;7{S44N3Zn3@<F8FrhWHMvureR5OAgtcC!|J`;ea&h#2l?*xg
zyW{rfb)T#{C)!j!Tg@hweSVGZi#Sddmt9G->aHzbQTHIERDpF(!1g)GQaJ{9Zplk-
zye@a|@AU_#r!<?ddn51cceh&S(q6r#`cGEwSZj4<=8|oyFK1^nBuq;9@2}`7@jZRQ
z>O{6V{hxNd-12ggQTEo);V)vP&-Tc!p2{-S^Rub$w8x&gcgr9D_VnJeCX{_;|J2P}
zlz02&x_<b!a?@0UEq{GNd(^$cMQWPno-LkqS<H)#rzhZIzZ~a2@rBP6PyKCvDzK+{
zDc6y7jc>&wBDQX2hucLu6-|8C^Skma^IW)V_ne~}jhi)FnV1<F7#BMkI2iB)BU4tG
zk?}tZs{u2RGT;LV@Ph<cfGMiYKo-R3V-aH!@ly&>keK@Hao#ijU%z$=y=4>cw?qzQ
zVDbWnG9yDmy2g}zK9A(rhIe13OI+=&wK>}DRsV9|ZEf-U8{&)0wTy%<8`GUyls~zq
zo4)DT|D%6HB9F<EbqYQ$$8P^HeOPw${xYZC$6Ywu>di`2qHg8zibR_3{p5LfoBYYm
zyzW}IGxc}J?B04s;o;2qU^mg*8M8lpHn?hM_^7vK-s7%Yx2D;d3NMZS@UtMGz}-<W
zT+;7A|2noKQ-#I#rB&ybe%jbKb78*lM#sW`9a<;+1r$QBe-?3l`oQJOtM;izlllGy
zyZzFc`@dUhr}s@x*CqFs?3fjCSGqQ6eqW?>N8^%tYFG2u-sL@JUi+4LlJwK^__B94
Uy+>lhq8Hsv%iC;f{?uq20B`eLrT_o{

literal 0
HcmV?d00001

diff --git a/extras/TrustAnchors/MicrosoftRSARootCertificateAuthority2017.cer b/extras/TrustAnchors/MicrosoftRSARootCertificateAuthority2017.cer
new file mode 100644
index 0000000000000000000000000000000000000000..7031f880679bd310f3a39ef7c48a20f9a5cf4cfa
GIT binary patch
literal 1452
zcmchW`#0MM7{>EWLMKI3inb%mXcwcLZxZUZQgw+UL(<5|Sg9a1O+@Nc>0yz^a%xQ?
ziAyh2f?3_A?xoVIOH?=0y0qG|RI8@5x*QBOep>&6{q&yC`@H8p?|IMjfP9?_kPnmG
zgh2r))CfJCulL>9Z55G&zSWuGqXG?d^=yQG!W9Dm(AR;04BT!|PZvgo>!P4k3JwjL
z?*Ia2LSmlgvXj}dJd78c%VBe)cue+L+!4@WM~9*8{?o}6PYjvO-X3IddCXYm=_nop
z<9Uu3&*n0DsTe$na{|$31~?ZS9_Nh5JL2&8a5Do3Jm|EI1Q5g%!vC)`_)yD_9{}h;
zV0<VN0`j2<C?5(yH1tk6A?Hhl)D)rUAV#Z2i-kvC`bzrC-knci6Q%L1*tlSVMREE1
z<g}Mk0HpyD*Zq$1DMokh_PWJOn)r6pON`$hvi3hztff`?%c~7v1bA6w@5)6<GP7bF
zUEmwjZ_lWjJ`0vRGlIW0^KEUq)M(ylHZ$ULW31teI!!mnzvfiwbJh6VhT9Vw_l`$j
zf5VG_#8s;^ur8erMeks;TWn^G_CS^W8c}CKx9M8)@_7Qiw|E_EQ+)fXG)Fq@%6CsW
zc6*Q<6~eLhc<>;6p+DzD`(8S!Z!3-zXq;EQ{Na2>e)i~QBqnpBIKXoKv8cN35iy@g
zO%wa{#aRm!=JDYC{E11&w3s&qb@HdAOK$GeZtGgw;!mh&zStskNu+mHX_@8;N)_PI
zt-beJ7*$FJTQ6XO*hpu}06`yRD;~MpVbf<<Z+<Z#L_-|%!*V0C|9s-}+K+LgmMm$b
zm+WKEjEmx1ADbk~yP1{+ON7aHYav%WgZmwVQY2Ly&g!wLv{tQFKIO|CFhm3=qS~sE
zPT|eQjgs%tp*1v1;duY=L!%+uO1B>BCfabAhZuT#YnIuPZ!Pxg-nB~ha$V9;9S_%)
zCv;t3Tljv;IHAjDJWlm!%c?|#IQe*Qt4+n|+*;+}p>Oc1VhO##rTY_IbybGpQAimS
z20#GiNstU0Zrj`f2>@Gg_;!$lAaaLMJFEl3whL&n(=dda!uRS8gk=aDIN}5MU9?@}
zZ|}B~8mvGgT|HY}01oh-On{vYkdJ-09lUMd0g$R%_lSFY@<dmZZ*oWSO<GVT<;U%z
zgQhxRSPf>Tt!3uG9H}Bdw1(kTFNRzr4^jsyF0AOl%Lepxd+)nhM&d;ZKl6T&Ywy`T
z9<Q~gQo%Y)km10q7XAFFb#$~y5R==fD6ZC{5T5^qnDr02!lqWXHOhT!ax%tBf)6oH
zW%@oNz-!Jl7Vu6UnvlI()lyB4wy^FaN{!XbOJ`rkyr&dS`JcnwP#|B8Ou*iU?VBNr
z8ffA2reDU)Y|Tzgrwph=3tgS+x0r{eQrXnYK&4X(skmsBg|-;}XKsDT#{$LrbtP=t
z63ev}F4Ee;cLzxm7em{Xs#S+nk$Q3g8nsfsfowN7+g;;1p5B2~ZrZyJ$>jCP76&ia
z(lMgy=D66@W!IkaJi-S`Zl7=c9%)ZuhPZzu7KiaP%C^%VQP(;YXkxO~QM4iT-(OwG
zDN}DMKEIiymc=C*&x(IQF!#q4T7|Ax+1PVBW4rYQ^V63XWx#5JL>3p&5U*^E7Qgk#
zx!@Lwe3R4ClRodX$@`-(h`^nayRbTpYdiJ7=A?hh{!xXOC3~B)W|mea6`A6^2<OtJ
z$`=SQTQ)|5Bt`pR16+>_=oyUWI0v%bb<@OK6=P}2<AF)N`WpAFSLO4~02mpfOkL(M
S%RRl3!n(uKo};rhNWs5k+;U6+

literal 0
HcmV?d00001

diff --git a/src/BearSSLTrustAnchors.h b/src/BearSSLTrustAnchors.h
index 43d6f5a..8f457ff 100644
--- a/src/BearSSLTrustAnchors.h
+++ b/src/BearSSLTrustAnchors.h
@@ -217,44 +217,6 @@ static const unsigned char TA3_RSA_E[] = {
 };
 
 static const unsigned char TA4_DN[] = {
-  0x30, 0x3F, 0x31, 0x24, 0x30, 0x22, 0x06, 0x03, 0x55, 0x04, 0x0A, 0x13,
-  0x1B, 0x44, 0x69, 0x67, 0x69, 0x74, 0x61, 0x6C, 0x20, 0x53, 0x69, 0x67,
-  0x6E, 0x61, 0x74, 0x75, 0x72, 0x65, 0x20, 0x54, 0x72, 0x75, 0x73, 0x74,
-  0x20, 0x43, 0x6F, 0x2E, 0x31, 0x17, 0x30, 0x15, 0x06, 0x03, 0x55, 0x04,
-  0x03, 0x13, 0x0E, 0x44, 0x53, 0x54, 0x20, 0x52, 0x6F, 0x6F, 0x74, 0x20,
-  0x43, 0x41, 0x20, 0x58, 0x33
-};
-
-static const unsigned char TA4_RSA_N[] = {
-  0xDF, 0xAF, 0xE9, 0x97, 0x50, 0x08, 0x83, 0x57, 0xB4, 0xCC, 0x62, 0x65,
-  0xF6, 0x90, 0x82, 0xEC, 0xC7, 0xD3, 0x2C, 0x6B, 0x30, 0xCA, 0x5B, 0xEC,
-  0xD9, 0xC3, 0x7D, 0xC7, 0x40, 0xC1, 0x18, 0x14, 0x8B, 0xE0, 0xE8, 0x33,
-  0x76, 0x49, 0x2A, 0xE3, 0x3F, 0x21, 0x49, 0x93, 0xAC, 0x4E, 0x0E, 0xAF,
-  0x3E, 0x48, 0xCB, 0x65, 0xEE, 0xFC, 0xD3, 0x21, 0x0F, 0x65, 0xD2, 0x2A,
-  0xD9, 0x32, 0x8F, 0x8C, 0xE5, 0xF7, 0x77, 0xB0, 0x12, 0x7B, 0xB5, 0x95,
-  0xC0, 0x89, 0xA3, 0xA9, 0xBA, 0xED, 0x73, 0x2E, 0x7A, 0x0C, 0x06, 0x32,
-  0x83, 0xA2, 0x7E, 0x8A, 0x14, 0x30, 0xCD, 0x11, 0xA0, 0xE1, 0x2A, 0x38,
-  0xB9, 0x79, 0x0A, 0x31, 0xFD, 0x50, 0xBD, 0x80, 0x65, 0xDF, 0xB7, 0x51,
-  0x63, 0x83, 0xC8, 0xE2, 0x88, 0x61, 0xEA, 0x4B, 0x61, 0x81, 0xEC, 0x52,
-  0x6B, 0xB9, 0xA2, 0xE2, 0x4B, 0x1A, 0x28, 0x9F, 0x48, 0xA3, 0x9E, 0x0C,
-  0xDA, 0x09, 0x8E, 0x3E, 0x17, 0x2E, 0x1E, 0xDD, 0x20, 0xDF, 0x5B, 0xC6,
-  0x2A, 0x8A, 0xAB, 0x2E, 0xBD, 0x70, 0xAD, 0xC5, 0x0B, 0x1A, 0x25, 0x90,
-  0x74, 0x72, 0xC5, 0x7B, 0x6A, 0xAB, 0x34, 0xD6, 0x30, 0x89, 0xFF, 0xE5,
-  0x68, 0x13, 0x7B, 0x54, 0x0B, 0xC8, 0xD6, 0xAE, 0xEC, 0x5A, 0x9C, 0x92,
-  0x1E, 0x3D, 0x64, 0xB3, 0x8C, 0xC6, 0xDF, 0xBF, 0xC9, 0x41, 0x70, 0xEC,
-  0x16, 0x72, 0xD5, 0x26, 0xEC, 0x38, 0x55, 0x39, 0x43, 0xD0, 0xFC, 0xFD,
-  0x18, 0x5C, 0x40, 0xF1, 0x97, 0xEB, 0xD5, 0x9A, 0x9B, 0x8D, 0x1D, 0xBA,
-  0xDA, 0x25, 0xB9, 0xC6, 0xD8, 0xDF, 0xC1, 0x15, 0x02, 0x3A, 0xAB, 0xDA,
-  0x6E, 0xF1, 0x3E, 0x2E, 0xF5, 0x5C, 0x08, 0x9C, 0x3C, 0xD6, 0x83, 0x69,
-  0xE4, 0x10, 0x9B, 0x19, 0x2A, 0xB6, 0x29, 0x57, 0xE3, 0xE5, 0x3D, 0x9B,
-  0x9F, 0xF0, 0x02, 0x5D
-};
-
-static const unsigned char TA4_RSA_E[] = {
-  0x01, 0x00, 0x01
-};
-
-static const unsigned char TA5_DN[] = {
   0x30, 0x61, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13,
   0x02, 0x55, 0x53, 0x31, 0x15, 0x30, 0x13, 0x06, 0x03, 0x55, 0x04, 0x0A,
   0x13, 0x0C, 0x44, 0x69, 0x67, 0x69, 0x43, 0x65, 0x72, 0x74, 0x20, 0x49,
@@ -266,7 +228,7 @@ static const unsigned char TA5_DN[] = {
   0x20, 0x43, 0x41
 };
 
-static const unsigned char TA5_RSA_N[] = {
+static const unsigned char TA4_RSA_N[] = {
   0xE2, 0x3B, 0xE1, 0x11, 0x72, 0xDE, 0xA8, 0xA4, 0xD3, 0xA3, 0x57, 0xAA,
   0x50, 0xA2, 0x8F, 0x0B, 0x77, 0x90, 0xC9, 0xA2, 0xA5, 0xEE, 0x12, 0xCE,
   0x96, 0x5B, 0x01, 0x09, 0x20, 0xCC, 0x01, 0x93, 0xA7, 0x4E, 0x30, 0xB7,
@@ -291,6 +253,47 @@ static const unsigned char TA5_RSA_N[] = {
   0x90, 0xC3, 0xAF, 0x27
 };
 
+static const unsigned char TA4_RSA_E[] = {
+  0x01, 0x00, 0x01
+};
+
+static const unsigned char TA5_DN[] = {
+  0x30, 0x61, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13,
+  0x02, 0x55, 0x53, 0x31, 0x15, 0x30, 0x13, 0x06, 0x03, 0x55, 0x04, 0x0A,
+  0x13, 0x0C, 0x44, 0x69, 0x67, 0x69, 0x43, 0x65, 0x72, 0x74, 0x20, 0x49,
+  0x6E, 0x63, 0x31, 0x19, 0x30, 0x17, 0x06, 0x03, 0x55, 0x04, 0x0B, 0x13,
+  0x10, 0x77, 0x77, 0x77, 0x2E, 0x64, 0x69, 0x67, 0x69, 0x63, 0x65, 0x72,
+  0x74, 0x2E, 0x63, 0x6F, 0x6D, 0x31, 0x20, 0x30, 0x1E, 0x06, 0x03, 0x55,
+  0x04, 0x03, 0x13, 0x17, 0x44, 0x69, 0x67, 0x69, 0x43, 0x65, 0x72, 0x74,
+  0x20, 0x47, 0x6C, 0x6F, 0x62, 0x61, 0x6C, 0x20, 0x52, 0x6F, 0x6F, 0x74,
+  0x20, 0x47, 0x32
+};
+
+static const unsigned char TA5_RSA_N[] = {
+  0xBB, 0x37, 0xCD, 0x34, 0xDC, 0x7B, 0x6B, 0xC9, 0xB2, 0x68, 0x90, 0xAD,
+  0x4A, 0x75, 0xFF, 0x46, 0xBA, 0x21, 0x0A, 0x08, 0x8D, 0xF5, 0x19, 0x54,
+  0xC9, 0xFB, 0x88, 0xDB, 0xF3, 0xAE, 0xF2, 0x3A, 0x89, 0x91, 0x3C, 0x7A,
+  0xE6, 0xAB, 0x06, 0x1A, 0x6B, 0xCF, 0xAC, 0x2D, 0xE8, 0x5E, 0x09, 0x24,
+  0x44, 0xBA, 0x62, 0x9A, 0x7E, 0xD6, 0xA3, 0xA8, 0x7E, 0xE0, 0x54, 0x75,
+  0x20, 0x05, 0xAC, 0x50, 0xB7, 0x9C, 0x63, 0x1A, 0x6C, 0x30, 0xDC, 0xDA,
+  0x1F, 0x19, 0xB1, 0xD7, 0x1E, 0xDE, 0xFD, 0xD7, 0xE0, 0xCB, 0x94, 0x83,
+  0x37, 0xAE, 0xEC, 0x1F, 0x43, 0x4E, 0xDD, 0x7B, 0x2C, 0xD2, 0xBD, 0x2E,
+  0xA5, 0x2F, 0xE4, 0xA9, 0xB8, 0xAD, 0x3A, 0xD4, 0x99, 0xA4, 0xB6, 0x25,
+  0xE9, 0x9B, 0x6B, 0x00, 0x60, 0x92, 0x60, 0xFF, 0x4F, 0x21, 0x49, 0x18,
+  0xF7, 0x67, 0x90, 0xAB, 0x61, 0x06, 0x9C, 0x8F, 0xF2, 0xBA, 0xE9, 0xB4,
+  0xE9, 0x92, 0x32, 0x6B, 0xB5, 0xF3, 0x57, 0xE8, 0x5D, 0x1B, 0xCD, 0x8C,
+  0x1D, 0xAB, 0x95, 0x04, 0x95, 0x49, 0xF3, 0x35, 0x2D, 0x96, 0xE3, 0x49,
+  0x6D, 0xDD, 0x77, 0xE3, 0xFB, 0x49, 0x4B, 0xB4, 0xAC, 0x55, 0x07, 0xA9,
+  0x8F, 0x95, 0xB3, 0xB4, 0x23, 0xBB, 0x4C, 0x6D, 0x45, 0xF0, 0xF6, 0xA9,
+  0xB2, 0x95, 0x30, 0xB4, 0xFD, 0x4C, 0x55, 0x8C, 0x27, 0x4A, 0x57, 0x14,
+  0x7C, 0x82, 0x9D, 0xCD, 0x73, 0x92, 0xD3, 0x16, 0x4A, 0x06, 0x0C, 0x8C,
+  0x50, 0xD1, 0x8F, 0x1E, 0x09, 0xBE, 0x17, 0xA1, 0xE6, 0x21, 0xCA, 0xFD,
+  0x83, 0xE5, 0x10, 0xBC, 0x83, 0xA5, 0x0A, 0xC4, 0x67, 0x28, 0xF6, 0x73,
+  0x14, 0x14, 0x3D, 0x46, 0x76, 0xC3, 0x87, 0x14, 0x89, 0x21, 0x34, 0x4D,
+  0xAF, 0x0F, 0x45, 0x0C, 0xA6, 0x49, 0xA1, 0xBA, 0xBB, 0x9C, 0xC5, 0xB1,
+  0x33, 0x83, 0x29, 0x85
+};
+
 static const unsigned char TA5_RSA_E[] = {
   0x01, 0x00, 0x01
 };
@@ -338,6 +341,44 @@ static const unsigned char TA6_RSA_E[] = {
 };
 
 static const unsigned char TA7_DN[] = {
+  0x30, 0x3F, 0x31, 0x24, 0x30, 0x22, 0x06, 0x03, 0x55, 0x04, 0x0A, 0x13,
+  0x1B, 0x44, 0x69, 0x67, 0x69, 0x74, 0x61, 0x6C, 0x20, 0x53, 0x69, 0x67,
+  0x6E, 0x61, 0x74, 0x75, 0x72, 0x65, 0x20, 0x54, 0x72, 0x75, 0x73, 0x74,
+  0x20, 0x43, 0x6F, 0x2E, 0x31, 0x17, 0x30, 0x15, 0x06, 0x03, 0x55, 0x04,
+  0x03, 0x13, 0x0E, 0x44, 0x53, 0x54, 0x20, 0x52, 0x6F, 0x6F, 0x74, 0x20,
+  0x43, 0x41, 0x20, 0x58, 0x33
+};
+
+static const unsigned char TA7_RSA_N[] = {
+  0xDF, 0xAF, 0xE9, 0x97, 0x50, 0x08, 0x83, 0x57, 0xB4, 0xCC, 0x62, 0x65,
+  0xF6, 0x90, 0x82, 0xEC, 0xC7, 0xD3, 0x2C, 0x6B, 0x30, 0xCA, 0x5B, 0xEC,
+  0xD9, 0xC3, 0x7D, 0xC7, 0x40, 0xC1, 0x18, 0x14, 0x8B, 0xE0, 0xE8, 0x33,
+  0x76, 0x49, 0x2A, 0xE3, 0x3F, 0x21, 0x49, 0x93, 0xAC, 0x4E, 0x0E, 0xAF,
+  0x3E, 0x48, 0xCB, 0x65, 0xEE, 0xFC, 0xD3, 0x21, 0x0F, 0x65, 0xD2, 0x2A,
+  0xD9, 0x32, 0x8F, 0x8C, 0xE5, 0xF7, 0x77, 0xB0, 0x12, 0x7B, 0xB5, 0x95,
+  0xC0, 0x89, 0xA3, 0xA9, 0xBA, 0xED, 0x73, 0x2E, 0x7A, 0x0C, 0x06, 0x32,
+  0x83, 0xA2, 0x7E, 0x8A, 0x14, 0x30, 0xCD, 0x11, 0xA0, 0xE1, 0x2A, 0x38,
+  0xB9, 0x79, 0x0A, 0x31, 0xFD, 0x50, 0xBD, 0x80, 0x65, 0xDF, 0xB7, 0x51,
+  0x63, 0x83, 0xC8, 0xE2, 0x88, 0x61, 0xEA, 0x4B, 0x61, 0x81, 0xEC, 0x52,
+  0x6B, 0xB9, 0xA2, 0xE2, 0x4B, 0x1A, 0x28, 0x9F, 0x48, 0xA3, 0x9E, 0x0C,
+  0xDA, 0x09, 0x8E, 0x3E, 0x17, 0x2E, 0x1E, 0xDD, 0x20, 0xDF, 0x5B, 0xC6,
+  0x2A, 0x8A, 0xAB, 0x2E, 0xBD, 0x70, 0xAD, 0xC5, 0x0B, 0x1A, 0x25, 0x90,
+  0x74, 0x72, 0xC5, 0x7B, 0x6A, 0xAB, 0x34, 0xD6, 0x30, 0x89, 0xFF, 0xE5,
+  0x68, 0x13, 0x7B, 0x54, 0x0B, 0xC8, 0xD6, 0xAE, 0xEC, 0x5A, 0x9C, 0x92,
+  0x1E, 0x3D, 0x64, 0xB3, 0x8C, 0xC6, 0xDF, 0xBF, 0xC9, 0x41, 0x70, 0xEC,
+  0x16, 0x72, 0xD5, 0x26, 0xEC, 0x38, 0x55, 0x39, 0x43, 0xD0, 0xFC, 0xFD,
+  0x18, 0x5C, 0x40, 0xF1, 0x97, 0xEB, 0xD5, 0x9A, 0x9B, 0x8D, 0x1D, 0xBA,
+  0xDA, 0x25, 0xB9, 0xC6, 0xD8, 0xDF, 0xC1, 0x15, 0x02, 0x3A, 0xAB, 0xDA,
+  0x6E, 0xF1, 0x3E, 0x2E, 0xF5, 0x5C, 0x08, 0x9C, 0x3C, 0xD6, 0x83, 0x69,
+  0xE4, 0x10, 0x9B, 0x19, 0x2A, 0xB6, 0x29, 0x57, 0xE3, 0xE5, 0x3D, 0x9B,
+  0x9F, 0xF0, 0x02, 0x5D
+};
+
+static const unsigned char TA7_RSA_E[] = {
+  0x01, 0x00, 0x01
+};
+
+static const unsigned char TA8_DN[] = {
   0x30, 0x81, 0xB0, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06,
   0x13, 0x02, 0x55, 0x53, 0x31, 0x16, 0x30, 0x14, 0x06, 0x03, 0x55, 0x04,
   0x0A, 0x13, 0x0D, 0x45, 0x6E, 0x74, 0x72, 0x75, 0x73, 0x74, 0x2C, 0x20,
@@ -355,7 +396,7 @@ static const unsigned char TA7_DN[] = {
   0x6E, 0x20, 0x41, 0x75, 0x74, 0x68, 0x6F, 0x72, 0x69, 0x74, 0x79
 };
 
-static const unsigned char TA7_RSA_N[] = {
+static const unsigned char TA8_RSA_N[] = {
   0xB6, 0x95, 0xB6, 0x43, 0x42, 0xFA, 0xC6, 0x6D, 0x2A, 0x6F, 0x48, 0xDF,
   0x94, 0x4C, 0x39, 0x57, 0x05, 0xEE, 0xC3, 0x79, 0x11, 0x41, 0x68, 0x36,
   0xED, 0xEC, 0xFE, 0x9A, 0x01, 0x8F, 0xA1, 0x38, 0x28, 0xFC, 0xF7, 0x10,
@@ -380,11 +421,11 @@ static const unsigned char TA7_RSA_N[] = {
   0xD3, 0xDA, 0xD8, 0xCB
 };
 
-static const unsigned char TA7_RSA_E[] = {
+static const unsigned char TA8_RSA_E[] = {
   0x01, 0x00, 0x01
 };
 
-static const unsigned char TA8_DN[] = {
+static const unsigned char TA9_DN[] = {
   0x30, 0x4E, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13,
   0x02, 0x55, 0x53, 0x31, 0x10, 0x30, 0x0E, 0x06, 0x03, 0x55, 0x04, 0x0A,
   0x13, 0x07, 0x45, 0x71, 0x75, 0x69, 0x66, 0x61, 0x78, 0x31, 0x2D, 0x30,
@@ -394,7 +435,7 @@ static const unsigned char TA8_DN[] = {
   0x75, 0x74, 0x68, 0x6F, 0x72, 0x69, 0x74, 0x79
 };
 
-static const unsigned char TA8_RSA_N[] = {
+static const unsigned char TA9_RSA_N[] = {
   0xC1, 0x5D, 0xB1, 0x58, 0x67, 0x08, 0x62, 0xEE, 0xA0, 0x9A, 0x2D, 0x1F,
   0x08, 0x6D, 0x91, 0x14, 0x68, 0x98, 0x0A, 0x1E, 0xFE, 0xDA, 0x04, 0x6F,
   0x13, 0x84, 0x62, 0x21, 0xC3, 0xD1, 0x7C, 0xCE, 0x9F, 0x05, 0xE0, 0xB8,
@@ -408,11 +449,11 @@ static const unsigned char TA8_RSA_N[] = {
   0x88, 0xE7, 0xBF, 0x14, 0xFD, 0xE0, 0xC7, 0xB9
 };
 
-static const unsigned char TA8_RSA_E[] = {
+static const unsigned char TA9_RSA_E[] = {
   0x01, 0x00, 0x01
 };
 
-static const unsigned char TA9_DN[] = {
+static const unsigned char TA10_DN[] = {
   0x30, 0x42, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13,
   0x02, 0x55, 0x53, 0x31, 0x16, 0x30, 0x14, 0x06, 0x03, 0x55, 0x04, 0x0A,
   0x13, 0x0D, 0x47, 0x65, 0x6F, 0x54, 0x72, 0x75, 0x73, 0x74, 0x20, 0x49,
@@ -421,7 +462,7 @@ static const unsigned char TA9_DN[] = {
   0x6C, 0x6F, 0x62, 0x61, 0x6C, 0x20, 0x43, 0x41
 };
 
-static const unsigned char TA9_RSA_N[] = {
+static const unsigned char TA10_RSA_N[] = {
   0xDA, 0xCC, 0x18, 0x63, 0x30, 0xFD, 0xF4, 0x17, 0x23, 0x1A, 0x56, 0x7E,
   0x5B, 0xDF, 0x3C, 0x6C, 0x38, 0xE4, 0x71, 0xB7, 0x78, 0x91, 0xD4, 0xBC,
   0xA1, 0xD8, 0x4C, 0xF8, 0xA8, 0x43, 0xB6, 0x03, 0xE9, 0x4D, 0x21, 0x07,
@@ -446,11 +487,11 @@ static const unsigned char TA9_RSA_N[] = {
   0x71, 0x6B, 0xE4, 0xF9
 };
 
-static const unsigned char TA9_RSA_E[] = {
+static const unsigned char TA10_RSA_E[] = {
   0x01, 0x00, 0x01
 };
 
-static const unsigned char TA10_DN[] = {
+static const unsigned char TA11_DN[] = {
   0x30, 0x81, 0x98, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06,
   0x13, 0x02, 0x55, 0x53, 0x31, 0x16, 0x30, 0x14, 0x06, 0x03, 0x55, 0x04,
   0x0A, 0x13, 0x0D, 0x47, 0x65, 0x6F, 0x54, 0x72, 0x75, 0x73, 0x74, 0x20,
@@ -466,7 +507,7 @@ static const unsigned char TA10_DN[] = {
   0x68, 0x6F, 0x72, 0x69, 0x74, 0x79, 0x20, 0x2D, 0x20, 0x47, 0x33
 };
 
-static const unsigned char TA10_RSA_N[] = {
+static const unsigned char TA11_RSA_N[] = {
   0xDC, 0xE2, 0x5E, 0x62, 0x58, 0x1D, 0x33, 0x57, 0x39, 0x32, 0x33, 0xFA,
   0xEB, 0xCB, 0x87, 0x8C, 0xA7, 0xD4, 0x4A, 0xDD, 0x06, 0x88, 0xEA, 0x64,
   0x8E, 0x31, 0x98, 0xA5, 0x38, 0x90, 0x1E, 0x98, 0xCF, 0x2E, 0x63, 0x2B,
@@ -491,11 +532,11 @@ static const unsigned char TA10_RSA_N[] = {
   0xE3, 0xA5, 0xD5, 0x47
 };
 
-static const unsigned char TA10_RSA_E[] = {
+static const unsigned char TA11_RSA_E[] = {
   0x01, 0x00, 0x01
 };
 
-static const unsigned char TA11_DN[] = {
+static const unsigned char TA12_DN[] = {
   0x30, 0x4C, 0x31, 0x20, 0x30, 0x1E, 0x06, 0x03, 0x55, 0x04, 0x0B, 0x13,
   0x17, 0x47, 0x6C, 0x6F, 0x62, 0x61, 0x6C, 0x53, 0x69, 0x67, 0x6E, 0x20,
   0x52, 0x6F, 0x6F, 0x74, 0x20, 0x43, 0x41, 0x20, 0x2D, 0x20, 0x52, 0x32,
@@ -505,7 +546,7 @@ static const unsigned char TA11_DN[] = {
   0x61, 0x6C, 0x53, 0x69, 0x67, 0x6E
 };
 
-static const unsigned char TA11_RSA_N[] = {
+static const unsigned char TA12_RSA_N[] = {
   0xA6, 0xCF, 0x24, 0x0E, 0xBE, 0x2E, 0x6F, 0x28, 0x99, 0x45, 0x42, 0xC4,
   0xAB, 0x3E, 0x21, 0x54, 0x9B, 0x0B, 0xD3, 0x7F, 0x84, 0x70, 0xFA, 0x12,
   0xB3, 0xCB, 0xBF, 0x87, 0x5F, 0xC6, 0x7F, 0x86, 0xD3, 0xB2, 0x30, 0x5C,
@@ -530,11 +571,11 @@ static const unsigned char TA11_RSA_N[] = {
   0x03, 0xC2, 0x9B, 0x8F
 };
 
-static const unsigned char TA11_RSA_E[] = {
+static const unsigned char TA12_RSA_E[] = {
   0x01, 0x00, 0x01
 };
 
-static const unsigned char TA12_DN[] = {
+static const unsigned char TA13_DN[] = {
   0x30, 0x81, 0x83, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06,
   0x13, 0x02, 0x55, 0x53, 0x31, 0x10, 0x30, 0x0E, 0x06, 0x03, 0x55, 0x04,
   0x08, 0x13, 0x07, 0x41, 0x72, 0x69, 0x7A, 0x6F, 0x6E, 0x61, 0x31, 0x13,
@@ -549,7 +590,7 @@ static const unsigned char TA12_DN[] = {
   0x47, 0x32
 };
 
-static const unsigned char TA12_RSA_N[] = {
+static const unsigned char TA13_RSA_N[] = {
   0xBF, 0x71, 0x62, 0x08, 0xF1, 0xFA, 0x59, 0x34, 0xF7, 0x1B, 0xC9, 0x18,
   0xA3, 0xF7, 0x80, 0x49, 0x58, 0xE9, 0x22, 0x83, 0x13, 0xA6, 0xC5, 0x20,
   0x43, 0x01, 0x3B, 0x84, 0xF1, 0xE6, 0x85, 0x49, 0x9F, 0x27, 0xEA, 0xF6,
@@ -574,11 +615,11 @@ static const unsigned char TA12_RSA_N[] = {
   0x46, 0xB3, 0xE0, 0x47
 };
 
-static const unsigned char TA12_RSA_E[] = {
+static const unsigned char TA13_RSA_E[] = {
   0x01, 0x00, 0x01
 };
 
-static const unsigned char TA13_DN[] = {
+static const unsigned char TA14_DN[] = {
   0x30, 0x4F, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13,
   0x02, 0x55, 0x53, 0x31, 0x29, 0x30, 0x27, 0x06, 0x03, 0x55, 0x04, 0x0A,
   0x13, 0x20, 0x49, 0x6E, 0x74, 0x65, 0x72, 0x6E, 0x65, 0x74, 0x20, 0x53,
@@ -588,7 +629,7 @@ static const unsigned char TA13_DN[] = {
   0x47, 0x20, 0x52, 0x6F, 0x6F, 0x74, 0x20, 0x58, 0x31
 };
 
-static const unsigned char TA13_RSA_N[] = {
+static const unsigned char TA14_RSA_N[] = {
   0xAD, 0xE8, 0x24, 0x73, 0xF4, 0x14, 0x37, 0xF3, 0x9B, 0x9E, 0x2B, 0x57,
   0x28, 0x1C, 0x87, 0xBE, 0xDC, 0xB7, 0xDF, 0x38, 0x90, 0x8C, 0x6E, 0x3C,
   0xE6, 0x57, 0xA0, 0x78, 0xF7, 0x75, 0xC2, 0xA2, 0xFE, 0xF5, 0x6A, 0x6E,
@@ -634,11 +675,73 @@ static const unsigned char TA13_RSA_N[] = {
   0x6E, 0xFF, 0xBC, 0x64, 0xF5, 0x33, 0x43, 0x4F
 };
 
-static const unsigned char TA13_RSA_E[] = {
+static const unsigned char TA14_RSA_E[] = {
   0x01, 0x00, 0x01
 };
 
-static const unsigned char TA14_DN[] = {
+static const unsigned char TA15_DN[] = {
+  0x30, 0x65, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13,
+  0x02, 0x55, 0x53, 0x31, 0x1E, 0x30, 0x1C, 0x06, 0x03, 0x55, 0x04, 0x0A,
+  0x13, 0x15, 0x4D, 0x69, 0x63, 0x72, 0x6F, 0x73, 0x6F, 0x66, 0x74, 0x20,
+  0x43, 0x6F, 0x72, 0x70, 0x6F, 0x72, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x31,
+  0x36, 0x30, 0x34, 0x06, 0x03, 0x55, 0x04, 0x03, 0x13, 0x2D, 0x4D, 0x69,
+  0x63, 0x72, 0x6F, 0x73, 0x6F, 0x66, 0x74, 0x20, 0x52, 0x53, 0x41, 0x20,
+  0x52, 0x6F, 0x6F, 0x74, 0x20, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69,
+  0x63, 0x61, 0x74, 0x65, 0x20, 0x41, 0x75, 0x74, 0x68, 0x6F, 0x72, 0x69,
+  0x74, 0x79, 0x20, 0x32, 0x30, 0x31, 0x37
+};
+
+static const unsigned char TA15_RSA_N[] = {
+  0xCA, 0x5B, 0xBE, 0x94, 0x33, 0x8C, 0x29, 0x95, 0x91, 0x16, 0x0A, 0x95,
+  0xBD, 0x47, 0x62, 0xC1, 0x89, 0xF3, 0x99, 0x36, 0xDF, 0x46, 0x90, 0xC9,
+  0xA5, 0xED, 0x78, 0x6A, 0x6F, 0x47, 0x91, 0x68, 0xF8, 0x27, 0x67, 0x50,
+  0x33, 0x1D, 0xA1, 0xA6, 0xFB, 0xE0, 0xE5, 0x43, 0xA3, 0x84, 0x02, 0x57,
+  0x01, 0x5D, 0x9C, 0x48, 0x40, 0x82, 0x53, 0x10, 0xBC, 0xBF, 0xC7, 0x3B,
+  0x68, 0x90, 0xB6, 0x82, 0x2D, 0xE5, 0xF4, 0x65, 0xD0, 0xCC, 0x6D, 0x19,
+  0xCC, 0x95, 0xF9, 0x7B, 0xAC, 0x4A, 0x94, 0xAD, 0x0E, 0xDE, 0x4B, 0x43,
+  0x1D, 0x87, 0x07, 0x92, 0x13, 0x90, 0x80, 0x83, 0x64, 0x35, 0x39, 0x04,
+  0xFC, 0xE5, 0xE9, 0x6C, 0xB3, 0xB6, 0x1F, 0x50, 0x94, 0x38, 0x65, 0x50,
+  0x5C, 0x17, 0x46, 0xB9, 0xB6, 0x85, 0xB5, 0x1C, 0xB5, 0x17, 0xE8, 0xD6,
+  0x45, 0x9D, 0xD8, 0xB2, 0x26, 0xB0, 0xCA, 0xC4, 0x70, 0x4A, 0xAE, 0x60,
+  0xA4, 0xDD, 0xB3, 0xD9, 0xEC, 0xFC, 0x3B, 0xD5, 0x57, 0x72, 0xBC, 0x3F,
+  0xC8, 0xC9, 0xB2, 0xDE, 0x4B, 0x6B, 0xF8, 0x23, 0x6C, 0x03, 0xC0, 0x05,
+  0xBD, 0x95, 0xC7, 0xCD, 0x73, 0x3B, 0x66, 0x80, 0x64, 0xE3, 0x1A, 0xAC,
+  0x2E, 0xF9, 0x47, 0x05, 0xF2, 0x06, 0xB6, 0x9B, 0x73, 0xF5, 0x78, 0x33,
+  0x5B, 0xC7, 0xA1, 0xFB, 0x27, 0x2A, 0xA1, 0xB4, 0x9A, 0x91, 0x8C, 0x91,
+  0xD3, 0x3A, 0x82, 0x3E, 0x76, 0x40, 0xB4, 0xCD, 0x52, 0x61, 0x51, 0x70,
+  0x28, 0x3F, 0xC5, 0xC5, 0x5A, 0xF2, 0xC9, 0x8C, 0x49, 0xBB, 0x14, 0x5B,
+  0x4D, 0xC8, 0xFF, 0x67, 0x4D, 0x4C, 0x12, 0x96, 0xAD, 0xF5, 0xFE, 0x78,
+  0xA8, 0x97, 0x87, 0xD7, 0xFD, 0x5E, 0x20, 0x80, 0xDC, 0xA1, 0x4B, 0x22,
+  0xFB, 0xD4, 0x89, 0xAD, 0xBA, 0xCE, 0x47, 0x97, 0x47, 0x55, 0x7B, 0x8F,
+  0x45, 0xC8, 0x67, 0x28, 0x84, 0x95, 0x1C, 0x68, 0x30, 0xEF, 0xEF, 0x49,
+  0xE0, 0x35, 0x7B, 0x64, 0xE7, 0x98, 0xB0, 0x94, 0xDA, 0x4D, 0x85, 0x3B,
+  0x3E, 0x55, 0xC4, 0x28, 0xAF, 0x57, 0xF3, 0x9E, 0x13, 0xDB, 0x46, 0x27,
+  0x9F, 0x1E, 0xA2, 0x5E, 0x44, 0x83, 0xA4, 0xA5, 0xCA, 0xD5, 0x13, 0xB3,
+  0x4B, 0x3F, 0xC4, 0xE3, 0xC2, 0xE6, 0x86, 0x61, 0xA4, 0x52, 0x30, 0xB9,
+  0x7A, 0x20, 0x4F, 0x6F, 0x0F, 0x38, 0x53, 0xCB, 0x33, 0x0C, 0x13, 0x2B,
+  0x8F, 0xD6, 0x9A, 0xBD, 0x2A, 0xC8, 0x2D, 0xB1, 0x1C, 0x7D, 0x4B, 0x51,
+  0xCA, 0x47, 0xD1, 0x48, 0x27, 0x72, 0x5D, 0x87, 0xEB, 0xD5, 0x45, 0xE6,
+  0x48, 0x65, 0x9D, 0xAF, 0x52, 0x90, 0xBA, 0x5B, 0xA2, 0x18, 0x65, 0x57,
+  0x12, 0x9F, 0x68, 0xB9, 0xD4, 0x15, 0x6B, 0x94, 0xC4, 0x69, 0x22, 0x98,
+  0xF4, 0x33, 0xE0, 0xED, 0xF9, 0x51, 0x8E, 0x41, 0x50, 0xC9, 0x34, 0x4F,
+  0x76, 0x90, 0xAC, 0xFC, 0x38, 0xC1, 0xD8, 0xE1, 0x7B, 0xB9, 0xE3, 0xE3,
+  0x94, 0xE1, 0x46, 0x69, 0xCB, 0x0E, 0x0A, 0x50, 0x6B, 0x13, 0xBA, 0xAC,
+  0x0F, 0x37, 0x5A, 0xB7, 0x12, 0xB5, 0x90, 0x81, 0x1E, 0x56, 0xAE, 0x57,
+  0x22, 0x86, 0xD9, 0xC9, 0xD2, 0xD1, 0xD7, 0x51, 0xE3, 0xAB, 0x3B, 0xC6,
+  0x55, 0xFD, 0x1E, 0x0E, 0xD3, 0x74, 0x0A, 0xD1, 0xDA, 0xAA, 0xEA, 0x69,
+  0xB8, 0x97, 0x28, 0x8F, 0x48, 0xC4, 0x07, 0xF8, 0x52, 0x43, 0x3A, 0xF4,
+  0xCA, 0x55, 0x35, 0x2C, 0xB0, 0xA6, 0x6A, 0xC0, 0x9C, 0xF9, 0xF2, 0x81,
+  0xE1, 0x12, 0x6A, 0xC0, 0x45, 0xD9, 0x67, 0xB3, 0xCE, 0xFF, 0x23, 0xA2,
+  0x89, 0x0A, 0x54, 0xD4, 0x14, 0xB9, 0x2A, 0xA8, 0xD7, 0xEC, 0xF9, 0xAB,
+  0xCD, 0x25, 0x58, 0x32, 0x79, 0x8F, 0x90, 0x5B, 0x98, 0x39, 0xC4, 0x08,
+  0x06, 0xC1, 0xAC, 0x7F, 0x0E, 0x3D, 0x00, 0xA5
+};
+
+static const unsigned char TA15_RSA_E[] = {
+  0x01, 0x00, 0x01
+};
+
+static const unsigned char TA16_DN[] = {
   0x30, 0x5A, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13,
   0x02, 0x55, 0x53, 0x31, 0x12, 0x30, 0x10, 0x06, 0x03, 0x55, 0x04, 0x0A,
   0x13, 0x09, 0x49, 0x64, 0x65, 0x6E, 0x54, 0x72, 0x75, 0x73, 0x74, 0x31,
@@ -649,7 +752,7 @@ static const unsigned char TA14_DN[] = {
   0x72, 0x20, 0x43, 0x41, 0x20, 0x41, 0x35, 0x32
 };
 
-static const unsigned char TA14_RSA_N[] = {
+static const unsigned char TA16_RSA_N[] = {
   0x97, 0x69, 0xD7, 0x99, 0x98, 0x85, 0x02, 0x3F, 0xE9, 0x26, 0x42, 0x76,
   0xE8, 0xF4, 0x73, 0x3F, 0xA9, 0x32, 0x44, 0x26, 0x90, 0x78, 0x2E, 0x78,
   0x57, 0x91, 0x19, 0xA0, 0x5D, 0x76, 0x2B, 0x49, 0xF9, 0x93, 0x5A, 0x5D,
@@ -674,11 +777,11 @@ static const unsigned char TA14_RSA_N[] = {
   0x69, 0x80, 0x4B, 0x23
 };
 
-static const unsigned char TA14_RSA_E[] = {
+static const unsigned char TA16_RSA_E[] = {
   0x01, 0x00, 0x01
 };
 
-static const unsigned char TA15_DN[] = {
+static const unsigned char TA17_DN[] = {
   0x30, 0x81, 0xCA, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06,
   0x13, 0x02, 0x55, 0x53, 0x31, 0x17, 0x30, 0x15, 0x06, 0x03, 0x55, 0x04,
   0x0A, 0x13, 0x0E, 0x56, 0x65, 0x72, 0x69, 0x53, 0x69, 0x67, 0x6E, 0x2C,
@@ -699,7 +802,7 @@ static const unsigned char TA15_DN[] = {
   0x35
 };
 
-static const unsigned char TA15_RSA_N[] = {
+static const unsigned char TA17_RSA_N[] = {
   0xAF, 0x24, 0x08, 0x08, 0x29, 0x7A, 0x35, 0x9E, 0x60, 0x0C, 0xAA, 0xE7,
   0x4B, 0x3B, 0x4E, 0xDC, 0x7C, 0xBC, 0x3C, 0x45, 0x1C, 0xBB, 0x2B, 0xE0,
   0xFE, 0x29, 0x02, 0xF9, 0x57, 0x08, 0xA3, 0x64, 0x85, 0x15, 0x27, 0xF5,
@@ -724,11 +827,11 @@ static const unsigned char TA15_RSA_N[] = {
   0x53, 0xE8, 0x25, 0x15
 };
 
-static const unsigned char TA15_RSA_E[] = {
+static const unsigned char TA17_RSA_E[] = {
   0x01, 0x00, 0x01
 };
 
-static const br_x509_trust_anchor TAs[16] = {
+static const br_x509_trust_anchor TAs[18] = {
   {
     { (unsigned char *)TA0_DN, sizeof TA0_DN },
     BR_X509_TA_CA,
@@ -904,9 +1007,31 @@ static const br_x509_trust_anchor TAs[16] = {
         (unsigned char *)TA15_RSA_E, sizeof TA15_RSA_E,
       } }
     }
+  },
+  {
+    { (unsigned char *)TA16_DN, sizeof TA16_DN },
+    BR_X509_TA_CA,
+    {
+      BR_KEYTYPE_RSA,
+      { .rsa = {
+        (unsigned char *)TA16_RSA_N, sizeof TA16_RSA_N,
+        (unsigned char *)TA16_RSA_E, sizeof TA16_RSA_E,
+      } }
+    }
+  },
+  {
+    { (unsigned char *)TA17_DN, sizeof TA17_DN },
+    BR_X509_TA_CA,
+    {
+      BR_KEYTYPE_RSA,
+      { .rsa = {
+        (unsigned char *)TA17_RSA_N, sizeof TA17_RSA_N,
+        (unsigned char *)TA17_RSA_E, sizeof TA17_RSA_E,
+      } }
+    }
   }
 };
 
-#define TAs_NUM   16
+#define TAs_NUM   18
 
-#endif
+#endif