From 5895a2db7bfdba75bfba0683cd0afacaaa3249c6 Mon Sep 17 00:00:00 2001
From: Hanno Becker <hanno.becker@arm.com>
Date: Tue, 12 Mar 2019 16:49:26 +0000
Subject: [PATCH] Add build instructions to generate DER versions of CRTs and
 keys

---
 tests/data_files/Makefile               |  60 ++++++++++++++++++++++++
 tests/data_files/cli-rsa-sha256.crt.der | Bin 0 -> 835 bytes
 tests/data_files/cli-rsa-sha256.key.der | Bin 0 -> 1192 bytes
 tests/data_files/cli2.crt.der           | Bin 0 -> 560 bytes
 tests/data_files/cli2.key.der           | Bin 0 -> 121 bytes
 tests/data_files/server2.crt.der        | Bin 0 -> 827 bytes
 tests/data_files/server2.key.der        | Bin 0 -> 1192 bytes
 tests/data_files/server5.crt.der        | Bin 0 -> 547 bytes
 tests/data_files/server5.key.der        | Bin 0 -> 121 bytes
 tests/data_files/test-ca-sha1.crt.der   | Bin 0 -> 837 bytes
 tests/data_files/test-ca-sha256.crt.der | Bin 0 -> 837 bytes
 tests/data_files/test-ca.crt.der        | Bin 0 -> 837 bytes
 tests/data_files/test-ca2.crt.der       | Bin 0 -> 598 bytes
 tests/data_files/test-ca2.key.der       | Bin 0 -> 167 bytes
 tests/suites/test_suite_x509parse.data  |  12 +++++
 15 files changed, 72 insertions(+)
 create mode 100644 tests/data_files/cli-rsa-sha256.crt.der
 create mode 100644 tests/data_files/cli-rsa-sha256.key.der
 create mode 100644 tests/data_files/cli2.crt.der
 create mode 100644 tests/data_files/cli2.key.der
 create mode 100644 tests/data_files/server2.crt.der
 create mode 100644 tests/data_files/server2.key.der
 create mode 100644 tests/data_files/server5.crt.der
 create mode 100644 tests/data_files/server5.key.der
 create mode 100644 tests/data_files/test-ca-sha1.crt.der
 create mode 100644 tests/data_files/test-ca-sha256.crt.der
 create mode 100644 tests/data_files/test-ca.crt.der
 create mode 100644 tests/data_files/test-ca2.crt.der
 create mode 100644 tests/data_files/test-ca2.key.der

diff --git a/tests/data_files/Makefile b/tests/data_files/Makefile
index d023c8d0c..9a89bf514 100644
--- a/tests/data_files/Makefile
+++ b/tests/data_files/Makefile
@@ -46,14 +46,30 @@ test-ca.crt: $(test_ca_key_file_rsa) test-ca.req.sha256
 	$(MBEDTLS_CERT_WRITE) is_ca=1 serial=3 request_file=test-ca.req.sha256 selfsign=1 issuer_name="C=NL,O=PolarSSL,CN=PolarSSL Test CA" issuer_key=$(test_ca_key_file_rsa) issuer_pwd=$(test_ca_pwd_rsa) not_before=20110212144400 not_after=20210212144400 md=SHA1 version=3 output_file=$@
 all_final += test-ca.crt
 
+test-ca.crt.der: test-ca.crt
+	$(OPENSSL) x509 -inform PEM -in $< -outform DER -out $@
+all_final += test-ca.crt.der
+
+test-ca.key.der: $(test_ca_key_file_rsa)
+	$(OPENSSL) pkey -in $< -out $@ -inform PEM -outform DER -passin "pass:$(test_ca_pwd_rsa)"
+all_final += test-ca.key.der
+
 test-ca-sha1.crt: $(test_ca_key_file_rsa) test-ca.req.sha256
 	$(MBEDTLS_CERT_WRITE) is_ca=1 serial=3 request_file=test-ca.req.sha256 selfsign=1 issuer_name="C=NL,O=PolarSSL,CN=PolarSSL Test CA" issuer_key=$(test_ca_key_file_rsa) issuer_pwd=$(test_ca_pwd_rsa) not_before=20110212144400 not_after=20210212144400 md=SHA1 version=3 output_file=$@
 all_final += test-ca-sha1.crt
 
+test-ca-sha1.crt.der: test-ca-sha1.crt
+	$(OPENSSL) x509 -in $< -out $@ -inform PEM -outform DER
+all_final += test-ca-sha1.crt.der
+
 test-ca-sha256.crt: $(test_ca_key_file_rsa) test-ca.req.sha256
 	$(MBEDTLS_CERT_WRITE) is_ca=1 serial=3 request_file=test-ca.req.sha256 selfsign=1 issuer_name="C=NL,O=PolarSSL,CN=PolarSSL Test CA" issuer_key=$(test_ca_key_file_rsa) issuer_pwd=$(test_ca_pwd_rsa) not_before=20110212144400 not_after=20210212144400 md=SHA256 version=3 output_file=$@
 all_final += test-ca-sha256.crt
 
+test-ca-sha256.crt.der: test-ca-sha256.crt
+	$(OPENSSL) x509 -in $< -out $@ -inform PEM -outform DER
+all_final += test-ca-sha256.crt.der
+
 test_ca_key_file_rsa_alt = test-ca-alt.key
 
 $(test_ca_key_file_rsa_alt):
@@ -74,6 +90,14 @@ all_final += test-ca-good-alt.crt
 test_ca_crt_file_ec = test-ca2.crt
 test_ca_key_file_ec = test-ca2.key
 
+test-ca2.crt.der: $(test_ca_crt_file_ec)
+	$(OPENSSL) x509 -in $(test_ca_crt_file_ec) -out $@ -inform PEM -outform DER
+all_final += test-ca2.crt.der
+
+ test-ca2.key.der: $(test_ca_key_file_ec)
+	$(OPENSSL) pkey -in $(test_ca_key_file_ec) -out $@ -inform PEM -outform DER
+all_final += test-ca2.key.der
+
 test_ca_crt_cat12 = test-ca_cat12.crt
 $(test_ca_crt_cat12): $(test_ca_crt) $(test_ca_crt_file_ec)
 	cat $(test_ca_crt) $(test_ca_crt_file_ec) > $@
@@ -112,6 +136,14 @@ cli-rsa-sha256.crt: cli-rsa.csr
 	$(MBEDTLS_CERT_WRITE) request_file=$< serial=4 issuer_crt=$(test_ca_crt) issuer_key=$(test_ca_key_file_rsa) issuer_pwd=$(test_ca_pwd_rsa) not_before=20110212144406 not_after=20210212144406 md=SHA256 version=3 output_file=$@
 all_final += cli-rsa-sha256.crt
 
+cli-rsa-sha256.crt.der: cli-rsa-sha256.crt
+	$(OPENSSL) x509 -in $< -out $@ -inform PEM -outform DER
+all_final += cli-rsa-sha256.crt.der
+
+ cli-rsa.key.der: $(cli_crt_key_file_rsa)
+	$(OPENSSL) pkey -in $< -out $@ -inform PEM -outform DER
+all_final += cli-rsa.key.der
+
 test_ca_int_rsa1 = test-int-ca.crt
 
 server7.csr: server7.key
@@ -130,6 +162,22 @@ server7_int-ca-exp.crt: server7.crt test-int-ca-exp.crt
 	cat server7.crt test-int-ca-exp.crt > $@
 all_final += server7_int-ca-exp.crt
 
+cli2.crt.der: cli2.crt
+	$(OPENSSL) x509 -in $< -out $@ -inform PEM -outform DER
+all_final += cli2.crt.der
+
+ cli2.key.der: cli2.key
+	$(OPENSSL) pkey -in $< -out $@ -inform PEM -outform DER
+all_final += cli2.key.der
+
+ server5.crt.der: server5.crt
+	$(OPENSSL) x509 -in $< -out $@ -inform PEM -outform DER
+all_final += server5.crt.der
+
+ server5.key.der: server5.key
+	$(OPENSSL) pkey -in $< -out $@ -inform PEM -outform DER
+all_final += server5.key.der
+
 server5-ss-expired.crt: server5.key
 	$(FAKETIME) -f -3653d $(OPENSSL) req -x509 -new -subj "/C=UK/O=mbed TLS/OU=testsuite/CN=localhost" -days 3653 -sha256 -key $< -out $@
 all_final += server5-ss-expired.crt
@@ -819,6 +867,18 @@ server2.req.sha256: server2.key
 	$(MBEDTLS_CERT_REQ) output_file=$@ filename=$< subject_name="C=NL,O=PolarSSL,CN=localhost" md=SHA256
 all_intermediate += server2.req.sha256
 
+server2.crt.der: server2.crt
+	$(OPENSSL) x509 -inform PEM -in $< -outform DER -out $@
+all_final += server2.crt.der
+
+server2-sha256.crt.der: server2-sha256.crt
+	$(OPENSSL) x509 -inform PEM -in $< -outform DER -out $@
+all_final += server2-sha256.crt.der
+
+server2.key.der: server2.key
+	$(OPENSSL) pkey -in $< -out $@ -inform PEM -outform DER
+all_final += server2.key.der
+
 # server5*
 
 # The use of 'Server 1' in the DN is intentional here, as the DN is hardcoded in the x509_write test suite.'
diff --git a/tests/data_files/cli-rsa-sha256.crt.der b/tests/data_files/cli-rsa-sha256.crt.der
new file mode 100644
index 0000000000000000000000000000000000000000..8fa3d1b5f0b1052e4cbbe0b32dc4c1dd8fddb7e7
GIT binary patch
literal 835
zcmXqLVzxJEVp3ng%*4pV#K>a6%f_kI=F#?@mywa1mBGN;klTQhjX9KsO_<5g$57CK
zAH?C};RwjjNh}Hu_A!(+5C;h{^9aC%6hcyqOB9?P4dldm4Gj&942=v;OiT>SqQrTP
zkhumn1PzxmkboF22shk0Co?s#M8U|QiBSpJwT!F`%uS5^3_x)%rY1&4h7%=6&g}fT
zweqFwO_78RwYw*O%9fjNyq34W%O))K=^dAwXVO~Pul`Wq;AMItc^+4u^!8gH>Q=ww
z5t!WODPi(?h1R9;uX<PX%QagPeVYRMmrwO5_?qXt>8kMIOHyy2Ilpoed0q1Az+3q%
z;eIPWuXuau!9jyU10#d0m%njb2=jOA`xO7vHhp4;fu7T*`?bHH@|6F7V|bvVfB&KS
zQ)_b+ul3&S&g#p5F#Cr<*qP0J!lKViSkjKa`)S6PHT4_kEVlG7sf9mIE!n90;Ga#m
zDNFjU2mWQPf9n63Wp90XR+l-+Z?i4K`SoQBGQ*m)F0HuoJfQH|Rx{Re*4*k7PmcWc
zxvCh?#LURRxY*ag8ytbM!YoV%3<k2m;FRTK5n~Z4T*y#d<e(o?7H9k?sDIDLyV-7v
z2J#?jWflnou?CSXQBRg`zIQ3;+s>=Yrt-hG+jIQyf8+oMCJ$hMGcrsmn_ZPVdH4Fz
zfO|)}=BPW>#wwI2?6ph!rNX{cC*ta<^K--wRH{3~bBhWsy3p{rgOTB9NRzPHE4HRS
zrQgjf&E)gm&eU|NjQaiCVB@c&ks{G7mw&RJ-u-~Fd($0}Gv^hQ9Fk6cHg%3_c4(RU
z?bcI{yuMFAYRcxn&gp$!Z)N*MxIK>1X}#%VuBSWpShKEwaBFei?D%TVm!3zWc-`;y
zZhY}8r09$JE4i<K_x$j2yB+ALS?xRZA?rH*H`*;l-od-fJp;|H_#WHD>tx-PdhR9?
zCBq`pyYp49nFj0W=JR=#J~K4DeyzEqSoHPevahyHN}_x33guZmpTF7ZVZiOe(whAM
Dj%H8F

literal 0
HcmV?d00001

diff --git a/tests/data_files/cli-rsa-sha256.key.der b/tests/data_files/cli-rsa-sha256.key.der
new file mode 100644
index 0000000000000000000000000000000000000000..8ef5a0464a6f427cfd0f08512855e1faa0556d7c
GIT binary patch
literal 1192
zcmV;Z1Xueof&`=j0RRGm0RaHWbi~ZL`L%iJMcEW!uzkCe@@pQSGp!Aeiab_j<=jNs
z%w~lL)%Yi{N;S}9o(gUox7zT2tL_XClZHtcH1nt`(pU8^)Gv1_gkepBP>-jTNO1LT
zO|sP!!_pe<=0oa26zg>A!0jK@S5B$(sO{3=!7y<!GBDNC_6X2cPezXNU->;}k%%xZ
zLbBg|`{fLG|Lifqc#prrf6A?FA=ZuAi)xN<;G6gmR?M@G6BXt(1ZKzX`8Ez}mG%jm
z250nTarnxlu_fUCJc~61XS(1|c7^<Z{5ET~>CG(zVotL?0MD;>plMcvYSO6G=TLFx
zwKfHJ1#NrC<i!0<)gfO30|5X50)hbmXHB*C1Bt47Z#yl@5TYZ=y-wQUXATUC#)N3!
z<(GBRjiZLy+tuq683@IG<u{iMbAV=cHSvhG^8EAROLk6kMb0e35GD<14WCIp)_{rU
z#Yq+2g}})Ef;SRc3TyUg4KfzJq!m=2XrZmjYvqjEb~RZqo3!Ea@K6Nq$m|8-&yD2L
zWP4s?;ClzW0+vo2cx<*qnlkp*0`-8*CT^wB<7J4>CaFN-;Q-)&Kf|$n-o8S*2Z0m9
z;1LlcEcmi|I@IKSU%9au`W+pYk=X>EyvelJeGXLikI*O$-FHi91V~|Z6$2YJt&aR8
z5eMoQTHYCG|F(yJfGS@MSh`<90)c@5;{&h$n9>V-a_KvcyruT6<st^M*IxaJOBQD`
zgCbatVx+V!`4$sY_Mb2LyAFPgZwT7R=^SPdaFdXY&yYGpiAn2&D*jrB&U8XS4UBV9
zyn7(U{q_rG?Wr#O5A{&_jW;%$Am78|C%l+)!4ykz>4OyiB;phmwr>wIo!OYt0)c@5
z;tc!4Gn+?<C-NrV>t60a_G4Q$BlXn>Vc(*kSTF=4E410#Mt?~4PtfYuphb#ei;S#u
zUivm=KDunWUTcymUTP24(xsJ#+H%F7$!j-WOPhD$XBr+b*g<GO)10*S>nbAOcq!6k
zl3Oo$WJ;o@Yd%o1da;dJv{kyck%gl#0)c=K9vSDnm*pbOq|1u6&>pm9%tfbq?GBkK
z(41iuxMGVjYq~QnWhmG-ZdB~4AU#pxEJDOm@TNL)ledPc{`PbS5>0zinIC#q=^!r{
zG%1(c2JY*>y)jSvP_ep6v&0<(uCUy`io}qkD4VuI2^-can;GechuNPs1*?&dZG4de
zfq?*&SMcB{{k`*?Lrp&YH%}u{jp0oGOjUq_x<CF=;V{)Z*>fGsCA_;orP_C<wfq{d
zd7-itq8|`a8U;W|wof$Hz{8|Am~)5=(?#6wQEmitnUfM&mdiOpv8lM>CH0&Xw~{Lq
zuw7xIsx*AfR4r);_uKrOhv+)?9ZYJ26)*t;fq?*=Q=zsmzy|f-T+vES$h~bc@m}RS
zaL}mbL04>tQxEGXpkj|hV(cz#aaCJt^mG*JdIR?Sq|U^w+8yw<sr?ZcI~1UhjV8Bs
za|!}1Zx7f(c*Apntg5f_?lQHF1^HQ8o<3!pblRYFl^0))Sp1GoEFQdp0vN0k#`$E6
Ghr<AUz)#))

literal 0
HcmV?d00001

diff --git a/tests/data_files/cli2.crt.der b/tests/data_files/cli2.crt.der
new file mode 100644
index 0000000000000000000000000000000000000000..6ad236e2f0ac6c798ef27050b07f25ab6ecdbca2
GIT binary patch
literal 560
zcmXqLV$v~aV%)TVnTe5!iILZUi;Y98&EuRc3p0~}ogudYCmVAp3!5;LpO2xS0Y8Yt
zCCm|!pOaV=9PDE#V;}_*Vipz#3l$gVD1@XImngV8D>yqE$cghB8XH&|nHZXy8X1^G
ziSrtPxJFQ}fg?fl<qc#Z=8M6sgqZJ~lbM=VqF`hYX&}tT4t6jTBh=;0jO@%#3@qVK
z*KI7me|gRB$vYbV3$1(iEO^bi(BN+-d}s6?C#!PbpYiB(OoG|816L(P3ZB-_zv}HO
z@pMDZ)tDdC`r8W@KRLd*ajrq*EU^D&g;|&k7{E@E<zo?J5vgK`Z%g^}Aoi)Cfc2(l
z)<@Lr&p$HA1G-dJnI+vIwLxTVu7ZjuqrLX&imj4+>QqkN{%uyX&}oSSr9s-n$#Bs5
zQC*VrnHR`0#hk%lkjiA>mC9SK(7b5o&K3NBdf)Zi?k@0|#=NGlqTuc)z6G1aPN()s
zowV0Utovc}eyz+qGX*9?hPj{Amt8H{p|b8_mc8M^Qz7~s7kc0M^CaFcuc+Pf_m7k3
UyQiD74xLpiPwLaCnHTN~0N4|><^TWy

literal 0
HcmV?d00001

diff --git a/tests/data_files/cli2.key.der b/tests/data_files/cli2.key.der
new file mode 100644
index 0000000000000000000000000000000000000000..acba6a027604b8c80da7e9179c04a4316477e9fa
GIT binary patch
literal 121
zcmV-<0EYiCcLD(c1R(bJhGg+)f97P3@5)Z;-A(WX|CS<(dW1M+7cya(w<@3t1_&yK
zNX|V20SBQ(13~}<SLLp;bKldfyOX$q{}Qh5=2NWBRa5pf4$Lm&V<ijUnBwzXU^bS(
b)fg0T<$s^mOGOyvux!;__?C}{aHHhMGDtfT

literal 0
HcmV?d00001

diff --git a/tests/data_files/server2.crt.der b/tests/data_files/server2.crt.der
new file mode 100644
index 0000000000000000000000000000000000000000..ec03190e12610688838c1ff3f27b0fb26632885d
GIT binary patch
literal 827
zcmXqLVm3EuVv=9L%*4n9L<YQUoLX%jZQpqr8Ch8w46F^g4LI4DLs{5_nf!bV1r7K?
z94;P?fc%`qqTpa3LrDX1kPtJE08B_BB(=Ci!P(J3PMp`!(7?#h$k4>Z#K0^{oYx4M
zYhXgqa3KQ$h~b<$`N@en8TrK}22G4g$gX5$WngY%<Yxeib1^kBGBO<WU3~ZXS=oy$
z*FB4N%v{4)@x;o;>%5h)*oCMkXBRVcEPp4LJ#Bf=mI?25i>mBYX8qY_vPR`=`2)3-
zo;e#dY8T#m)${D6%(OlK4zdJoHoLO;*TaovHzpiR+>#b#wn!~_)#{Qs_FBoN+gdl|
z7u@8P(e+IG9<5sJ_JX_1Ka*!G!-R*ongr5n*M(?zr&dl}_$cx4SqD#!cNsh%yW1|g
z?Z2>Nl_0ZReb@>qITs0j{?_hW-7ayDB#tHNA5ZK36?>!hvwEi{<IxFx_Ua!EPI&RX
zzjp8VarNxuthQB0m~3Xr+VQ_InGt=u*gI(24Z%e^4IP=5QJ48Q+>6u~JpTQa5Tn6#
zCT2zk#>Kt{-r$In6=q>FU@(vc2BRz=ix`W@Qq~tKJMP?1;13Y;O<0k#-nZL%vVlBE
zTA4+{K&(MzOVpF4o9|r;`nL1xvZ?&9?e-l1`yV;Lfyn|G;6OWyxxJ2_UU2VYvP>C^
zwlMF37Qv(aR?CmhF|8`!p&-)qF66_f4MC?X&PB5O2WI}etpAepdF!MbyEeW)S{9qA
z`?788J*}Vi!5U6&&Be|SSmN0yh@{TX6R6q~A*poewPjJ@r0ZK`OZ6{XX)`{*9kA}v
z$1A?kHoG0QwU#{cVtSe&qBBQ+*%>x()lR=@21;{cB76_ux{wzj*OU77rnu>{2<J_j
z+gHSy-usZ?B*l38H1`d@gA?vAyd-r|hv`e1<C4?fqB9DAn$~W3{>Wt7#C=BTy4jaQ
zS-KblwmeR%$PpA>swH^PQ)c!Nfz*Wdn{t_ve*M|65B|%3lw2`2?}6_1<>o5@#6dhp

literal 0
HcmV?d00001

diff --git a/tests/data_files/server2.key.der b/tests/data_files/server2.key.der
new file mode 100644
index 0000000000000000000000000000000000000000..9905ce76bf764b584ef3edb883b1f46be89eb2f3
GIT binary patch
literal 1192
zcmV;Z1Xueof&`=j0RRGm0RaHPO{3lC%^lGM*GY1?nXC?Y<T^Y`&pHzp&|2ipqX3Af
z?jCEFr&6?#?=5nAJ|vp_wlu6H^>^SVWQ?4!D1D*Y>Wt>e9G1NP!30vXHq@i~;jwnu
zkilWJW>PkyCR3`bbY2I28G_p?*dL(T4IC{=X7^hqb4KV3ice__wE&Re+JX>feXdk1
zi)DF{q2gh~%|J;A?r040i-yuhztFg<5d$87R;U^tL>Lbbg^SvYL|)<;#$qqWW{vt?
z*nRUSi75fakPbg5@i53r4)509$HymY#|1rl!~#5;9X=1}G?-h<b4yZ|*b$;EfQV^1
zTGJ1(-dQgZ$M@<I0Wg;W0|5X50)hbn0GCHZybyuK801;|;4L~1o)Fwa`xR`_{YZFh
z`RzF9-3ixUwLxUpWBQ#$3iv`3@w;AmAXAu2Wq*ceNaWA^Y9!(`y%e1+7UHCN)}riz
zLx;ZuT!<yvLAIswCsKs|D{dVY&2xzOkiQxJzNx<n(<4LD$6+e7PCQ}Mz1Xz+s0;Xh
zR?QC+C)(yavy7ZeggnDiSDYuB0(K@@f;qzzzHanHEgg(=K0}#V%kngGnqH;rpEhkP
z`J(61cv2h4_FF+|SAmJ?yP@70H#-wt%3%S9|KEc_Nq^S#E(rRN!hE!~3K!cBZFP!W
zG1X@KISaM6qs`Rsh>}`OY|H9fc>;lf0N*<KC0-;qCP0@j;7Ynu8&R)>1~McJ&qSzq
zr>(V&Sj@;Vw+*}qir}V<!gJ*sWRmFZOm7ROr}LWiZ)wUrBG476ASXfiLqdPClc5BK
z+MpcP#`lVz>RfoIRm5uri@<}+&VvQ`vKA}f20ys$7TQBI!H=-Gtgh6QxY}=O!vcYU
z0Nt(t&7g7`1&Z!3)NxDjKIOsTDT}6OFqr2O@7)pskR({}c9Q2kyCdPw`JvP}8$Tek
z4`phPRaZ9dvV=tZk%-}>-8)J^O?-y!;k82Vxna#%8FvD%Sb*CTJ;xuN?f<Np{LT4d
z1cQ-@4TeLE496RgO};P1e9c1j)2)vEodSV?7fX36Y#WVX!G*<YJAxbqTg}`OC39Pz
z*@RaRIdNl_^smEsUB`@osg~EnhXR&yeqSy;Hm+Hc*E$J!x$1Ai7DC)hmaQzZAR}Qd
zjkN+E;cS5cJYCD(n-0J)loGQ3b#;q$9(pDWw}F;{d2ZXhI>erb32vaK?2Dv@an1y<
z0)c@5!ly?ENNUK`vmoJ^?*CeEFnXm&K-?B$Lh&rzxW`rA2Rxmz(BA@rut-?pG^@|F
zg(D_-PkLEz`;0x`J!}F;oaJ6g@dXPXzeo?<5V<`a5O*qb`QN?G^B?POWXdaePxy1f
z5bt@FGah+03IB*2v_4GXCoXk>SP=suBbJ)A0)c=95@d0M0381BgX-NZ$SeS29*;WP
z9IMtei_x-LPdzs{0^rwh!LUc*2pWX!NX2}1gA!+}e4mh)$d3o~vtaT+Nf_HMlxtI-
zqGR4;*{dNgEehb!=(@yA9;NkBsKk=^e<9~(zYFF8ubdrQY(E??rVnU1j)lZ*crR}T
GAud+Y;XMKX

literal 0
HcmV?d00001

diff --git a/tests/data_files/server5.crt.der b/tests/data_files/server5.crt.der
new file mode 100644
index 0000000000000000000000000000000000000000..08d8dd311b525fd51171a1019ad3194dad91580a
GIT binary patch
literal 547
zcmXqLVv;v#VqCg_nTe5!iILNQi;Y98&EuRc3p0~}ogudYCmVAp3!5;LpO2xS0Y8Yt
zCCm|!pOaV=9PDE#V;}_*Vipz#3l$gVD1@XImngV8D>yqE$cghB8XH&|nHZXy8X1^G
ziSrtPxJFQ}feAtLg$x8B=5yxcCnx4)<QJD1L>dUQv4h>n#0YgPGb1~*69bF+nXsE>
zoN`e`cE=-i|10FZtNF<`vE;&9k*(h|lp>QR`8{R0p)C0SmHs7@*jTZ>T^)zA%Xvf3
zc4_hbVmz_s?f=D%a}642fxRp%%)(^AU?2;$U6zkUj720MacTb*_M6w67<rzi*7qd4
zEf?NrkOz`hW=S_lZ4jB8tDxe^Xs>;`VyonyI+c^Rf1A}TbXwv-X(%>vG8}Y%RF~v@
z<^^)(FlR6rq%s*Y%+iUuzU=m*rzyN2cKY4Do_I~z@c8QDhTWGh7Ym21ox~lx`of;?
z>-3*3RMa$`y2{Ry$w1Mpe(tf@W8ACNKdH)Ee?0%uR8{2p(~r})Mm~-ctx4NCq53$Z
RfPe8Z2E`yPzK_SR0ss?|s)_&r

literal 0
HcmV?d00001

diff --git a/tests/data_files/server5.key.der b/tests/data_files/server5.key.der
new file mode 100644
index 0000000000000000000000000000000000000000..6bd4ebb81c1f833140b5a097ef464bc9deffeb75
GIT binary patch
literal 121
zcmV-<0EYiCcLD(c1R(J$6Cid1aHu@L{ZsY>9`|ZphRC7>^1}?N>-8TG4yT|B1_&yK
zNX|V20SBQ(13~}<H_TSqb_pI@az4jdE&m{H?tJ+Mk#x|l6t(wgB3WXRPUQgDBN6}V
bFVZw!T^7BHh{9`k4OPvGDh~Pq$h7VMBnLAL

literal 0
HcmV?d00001

diff --git a/tests/data_files/test-ca-sha1.crt.der b/tests/data_files/test-ca-sha1.crt.der
new file mode 100644
index 0000000000000000000000000000000000000000..039fb9e43004e622bd1404116f68208800005c6d
GIT binary patch
literal 837
zcmXqLVs<oWV$xi|%*4pV#K>&G%f_kI=F#?@mywZ`mBGN;klTQhjX9KsO_<5g$57CK
zAH?C};RwjjNh}Hu_A!(+5C;h{^9aC%6hcyqOB9?P4dldm4Gj&942=v;OiT<6qQrTP
zkhzo@-o&Vc>{v!t2IeM4eg=akMlPl%Mn;AM_s#!^?|v|Cu6^6RX-2g!OT`wPRs1;f
z%9~fGYa}8#rYwCk`)K!lDY=;zGu!2=5A<5zw}>sMV81-?=HwSUivo|HTWk=t^3!vN
z0+G`$i;B1pJ$3kL_jDQG=AUo8k`L_AWGI;vZoOhD%Y?#@dz)|CUt9XfMyvn5dcxsj
z^H1-3lTf?;S&Pv=|KAa6O3cw$wp{)F_3<>lf&)+V_Wsd(_sB8yfQeqMN>S!%_l+VB
z&9&)Y+P)dC{#dzW(^fs9pDp4alJeE<gd;YF@G8zKHeYCPK7Z1kZ!iC>xvi&hv5v`G
zd4cFBi_{d(S3G%r(&7sWPi&rja`nr@pU$^W>u+E(nm02df6-MYW=00a#Q_F>20Xy{
zkrifPHDG3B{BIx&;_<PFv50Jmda`u$y-Pvgc3xdJmH)Nfp5uT28_0vCm02VV#2T<G
zKusXPFb7&AT-;*&QTFe4&gf~e!Sz=gJ_kLzY}|fAUFHAP8{zt57dK5g6|j1lx_}tR
z3Bd#U4Hx$XOFY|oT|%nd!lcG%Ry+3st(_u=^erwu-!Y^1|Nn=K0W0&<zvtZ9b}GNv
zQp#q9@~U3n#id#o%Qj#4x^rCRirw~~2d)ODr<Q2_Ox?pE>TP!7QC4hV&D%ba$=(yp
zSf5T{U|xOMYODB`ORhngYUdu$ke${2W5Fa@4<>WHgK<+21^?T)$E3-`#B5?uM^*ZC
z6Nm2K9(kA78#MN@`c78-w(<XrS65ev9G})d(=IrIqtoVb|EsvdxPlKyp9z^}EsDRm
VY1e_s-Z!^67v9P<I34UY0RSLGRcrtN

literal 0
HcmV?d00001

diff --git a/tests/data_files/test-ca-sha256.crt.der b/tests/data_files/test-ca-sha256.crt.der
new file mode 100644
index 0000000000000000000000000000000000000000..80a47e8d32e71d42d1e6d91a0182132e4d41de7b
GIT binary patch
literal 837
zcmXqLVs<oWV$xi|%*4pV#K>&G%f_kI=F#?@mywa1mBGN;klTQhjX9KsO_<5g$57CK
zAH?C};RwjjNh}Hu_A!(+5C;h{^9aC%6hcyqOB9?P4dldm4Gj&942=v;OiT<6qQrTP
zkhzo@-o&Vc>{v!t2IeM4eg=akMlPl%Mn;AM_s#!^?|v|Cu6^6RX-2g!OT`wPRs1;f
z%9~fGYa}8#rYwCk`)K!lDY=;zGu!2=5A<5zw}>sMV81-?=HwSUivo|HTWk=t^3!vN
z0+G`$i;B1pJ$3kL_jDQG=AUo8k`L_AWGI;vZoOhD%Y?#@dz)|CUt9XfMyvn5dcxsj
z^H1-3lTf?;S&Pv=|KAa6O3cw$wp{)F_3<>lf&)+V_Wsd(_sB8yfQeqMN>S!%_l+VB
z&9&)Y+P)dC{#dzW(^fs9pDp4alJeE<gd;YF@G8zKHeYCPK7Z1kZ!iC>xvi&hv5v`G
zd4cFBi_{d(S3G%r(&7sWPi&rja`nr@pU$^W>u+E(nm02df6-MYW=00a#Q_F>20Xy{
zkrifPHDG3B{BIx&;_<PFv50Jmda`u$y-Pvgc3xdJmH)Nfp5uT28_0vCm02VV#2T<G
zKusXPFlS^ai%$1A-L*qoTY9b051F>URqwXB9&g*pf2v)h<HcL`677ILKbY7S9{2gL
z_aQd?miFz}KFej}W@j8auiP~MnjeqFZEw&2|9(d;ypUd0c=y1Eh6DAw5_5E2?>s)W
zH+g^I#6??H3FmnEKh_hR$NNS^;d!aRG({n13rDd(wNE*ZpMH0E!Xk6;>F1()A{CRq
zGq18-?t5A@sCw1cUK8$J8EcDjTjv;G)vZ|>aYy8)$r+DOL$`NJweH47c5QhSW|)@T
zc)-rG=FZ%`3q6+3ZnIe;|9jV;UrTlrKjGiIeLd^#8RdnpA$vLVswY^gKYerZ*+eVP
Wl{;2MGnoYWvc|i*{=La^FbM!-?pDnJ

literal 0
HcmV?d00001

diff --git a/tests/data_files/test-ca.crt.der b/tests/data_files/test-ca.crt.der
new file mode 100644
index 0000000000000000000000000000000000000000..039fb9e43004e622bd1404116f68208800005c6d
GIT binary patch
literal 837
zcmXqLVs<oWV$xi|%*4pV#K>&G%f_kI=F#?@mywZ`mBGN;klTQhjX9KsO_<5g$57CK
zAH?C};RwjjNh}Hu_A!(+5C;h{^9aC%6hcyqOB9?P4dldm4Gj&942=v;OiT<6qQrTP
zkhzo@-o&Vc>{v!t2IeM4eg=akMlPl%Mn;AM_s#!^?|v|Cu6^6RX-2g!OT`wPRs1;f
z%9~fGYa}8#rYwCk`)K!lDY=;zGu!2=5A<5zw}>sMV81-?=HwSUivo|HTWk=t^3!vN
z0+G`$i;B1pJ$3kL_jDQG=AUo8k`L_AWGI;vZoOhD%Y?#@dz)|CUt9XfMyvn5dcxsj
z^H1-3lTf?;S&Pv=|KAa6O3cw$wp{)F_3<>lf&)+V_Wsd(_sB8yfQeqMN>S!%_l+VB
z&9&)Y+P)dC{#dzW(^fs9pDp4alJeE<gd;YF@G8zKHeYCPK7Z1kZ!iC>xvi&hv5v`G
zd4cFBi_{d(S3G%r(&7sWPi&rja`nr@pU$^W>u+E(nm02df6-MYW=00a#Q_F>20Xy{
zkrifPHDG3B{BIx&;_<PFv50Jmda`u$y-Pvgc3xdJmH)Nfp5uT28_0vCm02VV#2T<G
zKusXPFb7&AT-;*&QTFe4&gf~e!Sz=gJ_kLzY}|fAUFHAP8{zt57dK5g6|j1lx_}tR
z3Bd#U4Hx$XOFY|oT|%nd!lcG%Ry+3st(_u=^erwu-!Y^1|Nn=K0W0&<zvtZ9b}GNv
zQp#q9@~U3n#id#o%Qj#4x^rCRirw~~2d)ODr<Q2_Ox?pE>TP!7QC4hV&D%ba$=(yp
zSf5T{U|xOMYODB`ORhngYUdu$ke${2W5Fa@4<>WHgK<+21^?T)$E3-`#B5?uM^*ZC
z6Nm2K9(kA78#MN@`c78-w(<XrS65ev9G})d(=IrIqtoVb|EsvdxPlKyp9z^}EsDRm
VY1e_s-Z!^67v9P<I34UY0RSLGRcrtN

literal 0
HcmV?d00001

diff --git a/tests/data_files/test-ca2.crt.der b/tests/data_files/test-ca2.crt.der
new file mode 100644
index 0000000000000000000000000000000000000000..bb0b51f9dcf5d8750011d43d0799034b8dd5107f
GIT binary patch
literal 598
zcmXqLVhS>7V!Xb9nTe5!iId@=^P{>X=QA%1xY#(f+C0wLvM@6l*coygaI!Invaks=
z`S}<M8t{WST*4dy`8kP2!NER;G6qs0A!cD=uuySvjzUOkafyPfvx2juft)z6p|OFb
zk%^(HiKU4}lsK;uh-(DpQfz*ifdCsj*tJZIY^>UiEDTD_NenE9Z)ux2nn&ojhyDB0
zxl7a8+wVc%VZQKSW6OvuL0cwHwd7X5A1|(w<nc#ps^&Qz-S$HrK@ID#Wvy1cyW_G<
zUc`=5FE(ZNeRf={d3Z~F>2mk{tCE_bnX`he6}F^_B^b*sZd_o{IM+ZH=yO><7BLo)
zxw#4|o{aX|rz^Hf?x|BbdHc6njX@qrTA3x?AhiLjf`v{?94HNeCZvet0of<a!fL?G
z$oL;Q8ksX04APhk84hnrDh|__%1~P&q;{#WTJlHN47*AHjORV6y!5YXdwYqE_KxeB
zQ@9tWm+#oT@1mIzP|M%+Ia8F=4}|UVHWp<#_V|n;ht8btTPsVI^>=7I|1?L$%7HOv
RJ<q1|CG`gLIh@xj003IoyI=qS

literal 0
HcmV?d00001

diff --git a/tests/data_files/test-ca2.key.der b/tests/data_files/test-ca2.key.der
new file mode 100644
index 0000000000000000000000000000000000000000..bf64141aaef8c4820c385bf55303706db2846d4d
GIT binary patch
literal 167
zcmV;Y09gMpfusTf0R%9E*%c0;aqw3VGov`ThQX#0U2U`j;VE`S*N1N-t3)8`WP63N
zcISnas&v-Tq+aTv2L=Tzfdl{|p=1MM00hI@D>OkjSTBcG{``r$DML$6;BLbXS5q@N
zSkzLqk(D_MBi~;aBw|SX8kH%|EG>t^h*E&B)@rLE-MG^nZdka==(1^!^FggC!?a&@
Vr$=wq87Wn1no~O<v}P7yGaeU<NG<>X

literal 0
HcmV?d00001

diff --git a/tests/suites/test_suite_x509parse.data b/tests/suites/test_suite_x509parse.data
index 6786c361c..756929a4c 100644
--- a/tests/suites/test_suite_x509parse.data
+++ b/tests/suites/test_suite_x509parse.data
@@ -2,14 +2,26 @@ X509 Certificate information #1
 depends_on:MBEDTLS_PEM_PARSE_C:MBEDTLS_RSA_C:MBEDTLS_SHA1_C
 x509_cert_info:"data_files/server1.crt":"cert. version     \: 3\nserial number     \: 01\nissuer name       \: C=NL, O=PolarSSL, CN=PolarSSL Test CA\nsubject name      \: C=NL, O=PolarSSL, CN=PolarSSL Server 1\nissued  on        \: 2011-02-12 14\:44\:06\nexpires on        \: 2021-02-12 14\:44\:06\nsigned using      \: RSA with SHA1\nRSA key size      \: 2048 bits\nbasic constraints \: CA=false\n"
 
+X509 Certificate information #1 (DER)
+depends_on:MBEDTLS_RSA_C:MBEDTLS_SHA1_C
+x509_cert_info:"data_files/server1.der":"cert. version     \: 3\nserial number     \: 01\nissuer name       \: C=NL, O=PolarSSL, CN=PolarSSL Test CA\nsubject name      \: C=NL, O=PolarSSL, CN=PolarSSL Server 1\nissued  on        \: 2011-02-12 14\:44\:06\nexpires on        \: 2021-02-12 14\:44\:06\nsigned using      \: RSA with SHA1\nRSA key size      \: 2048 bits\nbasic constraints \: CA=false\n"
+
 X509 Certificate information #2
 depends_on:MBEDTLS_PEM_PARSE_C:MBEDTLS_RSA_C:MBEDTLS_SHA1_C
 x509_cert_info:"data_files/server2.crt":"cert. version     \: 3\nserial number     \: 02\nissuer name       \: C=NL, O=PolarSSL, CN=PolarSSL Test CA\nsubject name      \: C=NL, O=PolarSSL, CN=localhost\nissued  on        \: 2011-02-12 14\:44\:06\nexpires on        \: 2021-02-12 14\:44\:06\nsigned using      \: RSA with SHA1\nRSA key size      \: 2048 bits\nbasic constraints \: CA=false\n"
 
+X509 Certificate information #2 (DER)
+depends_on:MBEDTLS_RSA_C:MBEDTLS_SHA1_C
+x509_cert_info:"data_files/server2.crt.der":"cert. version     \: 3\nserial number     \: 02\nissuer name       \: C=NL, O=PolarSSL, CN=PolarSSL Test CA\nsubject name      \: C=NL, O=PolarSSL, CN=localhost\nissued  on        \: 2011-02-12 14\:44\:06\nexpires on        \: 2021-02-12 14\:44\:06\nsigned using      \: RSA with SHA1\nRSA key size      \: 2048 bits\nbasic constraints \: CA=false\n"
+
 X509 Certificate information #3
 depends_on:MBEDTLS_PEM_PARSE_C:MBEDTLS_RSA_C:MBEDTLS_SHA1_C
 x509_cert_info:"data_files/test-ca.crt":"cert. version     \: 3\nserial number     \: 03\nissuer name       \: C=NL, O=PolarSSL, CN=PolarSSL Test CA\nsubject name      \: C=NL, O=PolarSSL, CN=PolarSSL Test CA\nissued  on        \: 2011-02-12 14\:44\:00\nexpires on        \: 2021-02-12 14\:44\:00\nsigned using      \: RSA with SHA1\nRSA key size      \: 2048 bits\nbasic constraints \: CA=true\n"
 
+X509 Certificate information #3 (DER)
+depends_on:MBEDTLS_RSA_C:MBEDTLS_SHA1_C
+x509_cert_info:"data_files/test-ca.crt.der":"cert. version     \: 3\nserial number     \: 03\nissuer name       \: C=NL, O=PolarSSL, CN=PolarSSL Test CA\nsubject name      \: C=NL, O=PolarSSL, CN=PolarSSL Test CA\nissued  on        \: 2011-02-12 14\:44\:00\nexpires on        \: 2021-02-12 14\:44\:00\nsigned using      \: RSA with SHA1\nRSA key size      \: 2048 bits\nbasic constraints \: CA=true\n"
+
 X509 Certificate information MD2 Digest
 depends_on:MBEDTLS_PEM_PARSE_C:MBEDTLS_RSA_C:MBEDTLS_MD2_C
 x509_cert_info:"data_files/cert_md2.crt":"cert. version     \: 3\nserial number     \: 09\nissuer name       \: C=NL, O=PolarSSL, CN=PolarSSL Test CA\nsubject name      \: C=NL, O=PolarSSL, CN=PolarSSL Cert MD2\nissued  on        \: 2009-07-12 10\:56\:59\nexpires on        \: 2011-07-12 10\:56\:59\nsigned using      \: RSA with MD2\nRSA key size      \: 2048 bits\nbasic constraints \: CA=false\n"