From 64a06e48b3bd6ca570242c9726c2eaa9bf642663 Mon Sep 17 00:00:00 2001
From: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
Date: Mon, 8 May 2023 16:03:33 +0200
Subject: [PATCH] Add more test cases

Signed-off-by: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
---
 tests/data_files/Makefile                         |   9 +++++++++
 ...ityKeyId_subjectKeyId_sn_len_malformed.crt.der | Bin 0 -> 931 bytes
 ...ityKeyId_subjectKeyId_sn_tag_malformed.crt.der | Bin 0 -> 931 bytes
 ...tyKeyId_subjectKeyId_tag_len_malformed.crt.der | Bin 0 -> 931 bytes
 tests/suites/test_suite_x509parse.data            |  14 +++++++++++++-
 5 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 tests/data_files/authorityKeyId_subjectKeyId_sn_len_malformed.crt.der
 create mode 100644 tests/data_files/authorityKeyId_subjectKeyId_sn_tag_malformed.crt.der
 create mode 100644 tests/data_files/authorityKeyId_subjectKeyId_tag_len_malformed.crt.der

diff --git a/tests/data_files/Makefile b/tests/data_files/Makefile
index 30c65ff54..14cf5ae8d 100644
--- a/tests/data_files/Makefile
+++ b/tests/data_files/Makefile
@@ -565,6 +565,9 @@ authorityKeyId_empty.crt.der:
 authorityKeyId_subjectKeyId_tag_malformed.crt.der: authorityKeyId_subjectKeyId.crt.der
 	hexdump -ve '1/1 "%.2X"' $< | sed "s/0414A505E864B8DCDF600F50124D60A864AF4D8B4393/0114A505E864B8DCDF600F50124D60A864AF4D8B4393/" | xxd -r -p > $@
 
+authorityKeyId_subjectKeyId_tag_len_malformed.crt.der: authorityKeyId_subjectKeyId.crt.der
+	hexdump -ve '1/1 "%.2X"' $< | sed "s/0414A505E864B8DCDF600F50124D60A864AF4D8B4393/0413A505E864B8DCDF600F50124D60A864AF4D8B4393/" | xxd -r -p > $@
+
 authorityKeyId_subjectKeyId_length_malformed.crt.der: authorityKeyId_subjectKeyId.crt.der
 	hexdump -ve '1/1 "%.2X"' $< | sed "s/306D8014A505E864B8DC/306C8014A505E864B8DC/" | xxd -r -p > $@
 
@@ -583,6 +586,12 @@ authorityKeyId_subjectKeyId_issuer_tag1_malformed.crt.der: authorityKeyId_subjec
 authorityKeyId_subjectKeyId_issuer_tag2_malformed.crt.der: authorityKeyId_subjectKeyId.crt.der
 	hexdump -ve '1/1 "%.2X"' $< | sed "s/A43D303B310B30090603/003D303B310B30090603/" | xxd -r -p > $@
 
+authorityKeyId_subjectKeyId_sn_tag_malformed.crt.der: authorityKeyId_subjectKeyId.crt.der
+	hexdump -ve '1/1 "%.2X"' $< | sed "s/8214680430CD074DE63F/8114680430CD074DE63F/" | xxd -r -p > $@
+
+authorityKeyId_subjectKeyId_sn_len_malformed.crt.der: authorityKeyId_subjectKeyId.crt.der
+	hexdump -ve '1/1 "%.2X"' $< | sed "s/8214680430CD074DE63F/8213680430CD074DE63F/" | xxd -r -p > $@
+
 ################################################################
 #### Generate various RSA keys
 ################################################################
diff --git a/tests/data_files/authorityKeyId_subjectKeyId_sn_len_malformed.crt.der b/tests/data_files/authorityKeyId_subjectKeyId_sn_len_malformed.crt.der
new file mode 100644
index 0000000000000000000000000000000000000000..009fcf292c1290801e5d51d55ca9d2c809b24e6e
GIT binary patch
literal 931
zcmXqLVxDi%#MHiknTe5!NhE{C;4HiEGyAg#0@e60I33z5v~8CGFB_*;n@8JsUPeZ4
zRt5uWLv903Hs(+kHen_|A45R{eh`P7ha(_AC$T6v*vC-PKpZ5*%p(93QV2;cE>UoH
zG>{YLH8M6ZHLx%=G&D0XiW28F0db9?T*?e@VpKwQEF&uea}y&!gFzD`7gG}>Bf~-8
z#dn{dmA%Mv-Lq)N%r$%!PpoXb&RYqKU5I*eb}>W8@^^CC)0PKqnebk>sLD=d)}L)A
zYgE3LKTu2QnX^HocHym8J<m?cOxyGCAWP6@vnz{#J=|D!W5U72Eonh!i`0TwtuBdU
zua#`Nt#w0w!A)KnUC*@d(W=F6FSxt>GkLZ$On7*!Ng%CuU5IvfYURX*j}i}`b@1eP
zm%;O~yX}(O{tG)+2{Oyohpmv3bCKZZZ|%O-?GpD$;#iXY@wDDwu{UZzt9NQL9-Y8v
zul~{CgcslYYxj;HSI<7qYFl-L$!3<U9sdiH8PTVUy@RIR5L~3w(2;2wb(w#|y-0n*
z<KJHiF&a!~VrFDuT--RzpmDl^EHH*-`B=nQM3%C?NZE1cegc1hkZ;0@l=Z&d&XWzw
zK+?)A`3AWSSQRX^Ut&v9WHkvBk=B6G$H*}CJmc3bPrl8#u}m`N)#DGhJ|#2ndO7Wu
zztLrrO)}4ZiS_Sn)YX4kS@J(eYs&t2o)1^5FJtBXwfm#&Wlg?4v%VCE?!3Fe)l!#f
zhR4}SGi-kKC>;_#H;463;Cb1sjp^A7uipN@{^6c8PyR6Z2(+)g6?k^}n@y2-(hV0L
z=uUg&X8-aH--1OIDM2ff<dR?CdG=zbt#4|k&GxCTihP%BYNo&Xvohcj*Wr(aTTbkF
zxM1aJZM)WA>n@($o+J2lUHdw#npaXUTg(*Re8`Cvx%1B{!@4l$?IPn<Oo>@b;(V5`
ri`gX?s^2#Ef{VzJHp`BAlUHR-vH0_HQCDutq^yYQBerg8t}49%=80{t

literal 0
HcmV?d00001

diff --git a/tests/data_files/authorityKeyId_subjectKeyId_sn_tag_malformed.crt.der b/tests/data_files/authorityKeyId_subjectKeyId_sn_tag_malformed.crt.der
new file mode 100644
index 0000000000000000000000000000000000000000..93fb1e30bfcd360f43470868e26a66c2f359838e
GIT binary patch
literal 931
zcmXqLVxDi%#MHiknTe5!NhE{C;4HiEGyAg#0@e60I33z5v~8CGFB_*;n@8JsUPeZ4
zRt5uWLv903Hs(+kHen_|A45R{eh`P7ha(_AC$T6v*vC-PKpZ5*%p(93QV2;cE>UoH
zG>{YLH8M6ZHLx%=G&D0XiW28F0db9?T*?e@VpKwQEF&uea}y&!gFzD`7gG}>Bf~-8
z#dn{dmA%Mv-Lq)N%r$%!PpoXb&RYqKU5I*eb}>W8@^^CC)0PKqnebk>sLD=d)}L)A
zYgE3LKTu2QnX^HocHym8J<m?cOxyGCAWP6@vnz{#J=|D!W5U72Eonh!i`0TwtuBdU
zua#`Nt#w0w!A)KnUC*@d(W=F6FSxt>GkLZ$On7*!Ng%CuU5IvfYURX*j}i}`b@1eP
zm%;O~yX}(O{tG)+2{Oyohpmv3bCKZZZ|%O-?GpD$;#iXY@wDDwu{UZzt9NQL9-Y8v
zul~{CgcslYYxj;HSI<7qYFl-L$!3<U9sdiH8PTVUy@RIR5L~3w(2;2wb(w#|y-0n*
z<KJHiF&a!~VrFDuT--RzpmDl^EHH*-`B=nQM3%C?NZE1cegc1hkZ;0@l=Z&d&XWzw
zK+?)A`3AWSSQRX^Ut&v9WHl0#)_~E+$T0Oh<JT=uzRkF?Ofu%x;}5q!B{T1OIqjCe
z(PfiOGS7aA_3v!d)qh!8@;^sw%Kmqr4_B%$W99v|`=jh-O};&|z7&V<yt}~FQkQ9l
z$Jt3UY<~499TGh^hxJb2dD*Ou>Dddf-u}P-;hr;3{xJCnw6DDtcy{@lO_6uf4Hq8h
zPJ85L|MCsrf<+Z6K`WEwl3(9>_F|{4Z)&E^_NlIle3xu$roZ~LGT;%{;g5w|PV9KN
zVC89TyVhUpE}q<;BlvV(`#P(dS5hxq%oN^y$cYuX^Uo>6x-jPLBI8v|iCIhHe3q|^
q*(DdM-!}Jxi^!2S%Z_=IS7l7G`15j6S8mFrtcdC(wr*;!D!l;ah;6O_

literal 0
HcmV?d00001

diff --git a/tests/data_files/authorityKeyId_subjectKeyId_tag_len_malformed.crt.der b/tests/data_files/authorityKeyId_subjectKeyId_tag_len_malformed.crt.der
new file mode 100644
index 0000000000000000000000000000000000000000..89e1f4b98e71e995df31cd5f08592c2bac434f84
GIT binary patch
literal 931
zcmXqLVxDi%#MHiknTe5!NhE{C;4HiEGyAg#0@e60I33z5v~8CGFB_*;n@8JsUPeZ4
zRt5uWLv903Hs(+kHen_|A45R{eh`P7ha(_AC$T6v*vC-PKpZ5*%p(93QV2;cE>UoH
zG>{YLH8M6ZHLx%=G&D0XiW28F0db9?T*?e@VpKwQEF&uea}y&!gFzD`7gG}>Bf~-8
z#dn{dmA%Mv-Lq)N%r$%!PpoXb&RYqKU5I*eb}>W8@^^CC)0PKqnebk>sLD=d)}L)A
zYgE3LKTu2QnX^HocHym8J<m?cOxyGCAWP6@vnz{#J=|D!W5U72Eonh!i`0TwtuBdU
zua#`Nt#w0w!A)KnUC*@d(W=F6FSxt>GkLZ$On7*!Ng%CuU5IvfYURX*j}i}`b@1eP
zm%;O~yX}(O{tG)+2{Oyohpmv3bCKZZZ|%O-?GpD$;#iXY@wDDwu{UZzt9NQL9-Y8v
zul~{CgcslYYxj;HSI<7qYFl-L$!3<U9sdiH8PTVUy@RIR5L~3w(2;2wb(w#|y-0n*
z<KJHiF&a!~VrFDuT--RzpmDl^EHH*-`B=nQgqO0uNZE1cegc1hkZ;0@l=Z&d&XWzw
zK+?)A`3AWSBG?oxv|nONQDij{lh%OI$H*}CJmc3bPrl8#u}m`N)#DGhJ|#2ndO7Wu
zztLrrO)}4ZiS_Sn)YX4kS@J(eYs&t2o)1^5FJtBXwfm#&Wlg?4v%VCE?!3Fe)l!#f
zhR4}SGi-kKC>;_#H;463;Cb1sjp^A7uipN@{^6c8PyR6Z2(+)g6?k^}n@y2-(hV0L
z=uUg&X8-aH--1OIDM2ff<dR?CdG=zbt#4|k&GxCTihP%BYNo&Xvohcj*Wr(aTTbkF
zxM1aJZM)WA>n@($o+J2lUHdw#npaXUTg(*Re8`Cvx%1B{!@4l$?IPn<Oo>@b;(V5`
ri`gX?s^2#Ef{VzJHp`BAlUHR-vH0_HQCDutq^yYQBerg8t}49%<`HeK

literal 0
HcmV?d00001

diff --git a/tests/suites/test_suite_x509parse.data b/tests/suites/test_suite_x509parse.data
index 25576f48a..365a58c54 100644
--- a/tests/suites/test_suite_x509parse.data
+++ b/tests/suites/test_suite_x509parse.data
@@ -3309,6 +3309,10 @@ X509 CRT parse Subject Key Id - Wrong OCTET_STRING tag
 depends_on:MBEDTLS_MD_CAN_SHA256:MBEDTLS_RSA_C
 x509_crt_parse_subjectkeyid:"data_files/authorityKeyId_subjectKeyId_tag_malformed.crt.der":"":MBEDTLS_ERR_X509_INVALID_EXTENSIONS+MBEDTLS_ERR_ASN1_UNEXPECTED_TAG
 
+X509 CRT parse Subject Key Id - Wrong OCTET_STRING tag
+depends_on:MBEDTLS_MD_CAN_SHA256:MBEDTLS_RSA_C
+x509_crt_parse_subjectkeyid:"data_files/authorityKeyId_subjectKeyId_tag_len_malformed.crt.der":"":MBEDTLS_ERR_X509_INVALID_EXTENSIONS+MBEDTLS_ERR_ASN1_LENGTH_MISMATCH
+
 X509 CRT parse Authority Key Id - Correct Authority Key ID
 depends_on:MBEDTLS_MD_CAN_SHA256:MBEDTLS_RSA_C
 x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_subjectKeyId.crt.der":"A505E864B8DCDF600F50124D60A864AF4D8B4393":"NL/PolarSSL/PolarSSL Test CA/":"680430CD074DE63FCDC051260FD042C2B512B6BA":0
@@ -3349,7 +3353,15 @@ X509 CRT parse Authority Key Id - Wrong Issuer Tag 2
 depends_on:MBEDTLS_MD_CAN_SHA256:MBEDTLS_RSA_C
 x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_subjectKeyId_issuer_tag2_malformed.crt.der":"":"":"":MBEDTLS_ERR_X509_INVALID_EXTENSIONS+MBEDTLS_ERR_ASN1_UNEXPECTED_TAG
 
+X509 CRT parse Authority Key Id - Wrong Serial Number Tag
+depends_on:MBEDTLS_MD_CAN_SHA256:MBEDTLS_RSA_C
+x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_subjectKeyId_sn_tag_malformed.crt.der":"":"":"":MBEDTLS_ERR_X509_INVALID_EXTENSIONS+MBEDTLS_ERR_ASN1_UNEXPECTED_TAG
+
+X509 CRT parse Authority Key Id - Wrong Serial Number Tag length
+depends_on:MBEDTLS_MD_CAN_SHA256:MBEDTLS_RSA_C
+x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_subjectKeyId_sn_len_malformed.crt.der":"":"":"":MBEDTLS_ERR_X509_INVALID_EXTENSIONS+MBEDTLS_ERR_ASN1_LENGTH_MISMATCH
+
 # clusterfuzz-testcase-minimized-fuzz_x509crt-6666050834661376: test for bad sequence of names in authorityCertIssuer
 X509 CRT parse Authority Key Id - Wrong Issuer sequence
 depends_on:MBEDTLS_MD_CAN_MD5:MBEDTLS_RSA_C
-x509_crt_parse_authoritykeyid:"308201883082016FA0030201020209202020202020202020300D06092A864886F70D010104050030233110300E0603202020130720202020202020310F300D06032020201306202020202020301E170D3131303530383230353934385A170D3134303530373230353934385A30233110300E0603202020130720202020202020310F300D06032020201306202020202020305C300D06092A864886F70D0101010500034B003048024120202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020FF02032020FFA38185308182301D060320202004162020202020202020202020202020202020202020202030530603551D23044C304A80142020202020202020202020202020202020202020A12AA42530233110300E0603202020130720202020202020310F300D0603202020130620202020202082002020202020202020202020202020202020202020202020202020202020202020202020202020202020202020":0:"":0:MBEDTLS_ERR_X509_INVALID_EXTENSIONS+MBEDTLS_ERR_ASN1_OUT_OF_DATA
+x509_crt_parse_authoritykeyid:"308201883082016FA0030201020209202020202020202020300D06092A864886F70D010104050030233110300E0603202020130720202020202020310F300D06032020201306202020202020301E170D3131303530383230353934385A170D3134303530373230353934385A30233110300E0603202020130720202020202020310F300D06032020201306202020202020305C300D06092A864886F70D0101010500034B003048024120202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020FF02032020FFA38185308182301D060320202004162020202020202020202020202020202020202020202030530603551D23044C304A80142020202020202020202020202020202020202020A12AA42530233110300E0603202020130720202020202020310F300D0603202020130620202020202082002020202020202020202020202020202020202020202020202020202020202020202020202020202020202020":0:"":0:MBEDTLS_ERR_X509_INVALID_EXTENSIONS+MBEDTLS_ERR_ASN1_OUT_OF_DATA
\ No newline at end of file