From 5ff986cb0a51c90dfab16b2e57f9466c9f58b8d4 Mon Sep 17 00:00:00 2001
From: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
Date: Thu, 6 Apr 2023 09:22:20 +0200
Subject: [PATCH 01/14] Provide makefile rules to generate cerst for
 authorityKeyId, subjectKeyId tests

Signed-off-by: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
---
 tests/data_files/Makefile                     |  21 ++++++++++++++++++
 .../authorityKeyId_subjectKeyId.conf          |  11 +++++++++
 .../authorityKeyId_subjectKeyId.crt.der       | Bin 0 -> 536 bytes
 ...subjectKeyId_issuer_tag1_malformed.crt.der | Bin 0 -> 536 bytes
 ...subjectKeyId_issuer_tag2_malformed.crt.der | Bin 0 -> 536 bytes
 ...d_subjectKeyId_keyid_tag_malformed.crt.der | Bin 0 -> 536 bytes
 ...eyId_subjectKeyId_length_malformed.crt.der | Bin 0 -> 536 bytes
 ...ubjectKeyId_sequence_tag_malformed.crt.der | Bin 0 -> 536 bytes
 ...tyKeyId_subjectKeyId_tag_malformed.crt.der | Bin 0 -> 536 bytes
 9 files changed, 32 insertions(+)
 create mode 100644 tests/data_files/authorityKeyId_subjectKeyId.conf
 create mode 100644 tests/data_files/authorityKeyId_subjectKeyId.crt.der
 create mode 100644 tests/data_files/authorityKeyId_subjectKeyId_issuer_tag1_malformed.crt.der
 create mode 100644 tests/data_files/authorityKeyId_subjectKeyId_issuer_tag2_malformed.crt.der
 create mode 100644 tests/data_files/authorityKeyId_subjectKeyId_keyid_tag_malformed.crt.der
 create mode 100644 tests/data_files/authorityKeyId_subjectKeyId_length_malformed.crt.der
 create mode 100644 tests/data_files/authorityKeyId_subjectKeyId_sequence_tag_malformed.crt.der
 create mode 100644 tests/data_files/authorityKeyId_subjectKeyId_tag_malformed.crt.der

diff --git a/tests/data_files/Makefile b/tests/data_files/Makefile
index ea8e0c96a..702aefb6d 100644
--- a/tests/data_files/Makefile
+++ b/tests/data_files/Makefile
@@ -550,6 +550,27 @@ crl_cat_rsa-ec.pem:crl.pem crl-ec-sha256.pem
 
 all_final += crl_cat_ec-rsa.pem crl_cat_rsa-ec.pem
 
+authorityKeyId_subjectKeyId.crt.der:
+	$(OPENSSL) req -x509 -nodes -days 7300 -key server5.key -outform DER -out authorityKeyId_subjectKeyId.crt.der -config authorityKeyId_subjectKeyId.conf -extensions 'v3_req'
+
+authorityKeyId_subjectKeyId_tag_malformed.crt.der: authorityKeyId_subjectKeyId.crt.der
+	hexdump -ve '1/1 "%.2X"' $< | sed "s/04145061A58FD407D9D782010CE5657F8C6346A713BE/01145061A58FD407D9D782010CE5657F8C6346A713BE/" | xxd -r -p > $@
+
+authorityKeyId_subjectKeyId_length_malformed.crt.der: authorityKeyId_subjectKeyId.crt.der
+	hexdump -ve '1/1 "%.2X"' $< | sed "s/306D80145061A58FD407/306C80145061A58FD407/" | xxd -r -p > $@
+
+authorityKeyId_subjectKeyId_sequence_tag_malformed.crt.der: authorityKeyId_subjectKeyId.crt.der
+	hexdump -ve '1/1 "%.2X"' $< | sed "s/6F306D80145061A58FD4/6F006D80145061A58FD4/" | xxd -r -p > $@
+
+authorityKeyId_subjectKeyId_keyid_tag_malformed.crt.der: authorityKeyId_subjectKeyId.crt.der
+	hexdump -ve '1/1 "%.2X"' $< | sed "s/306D80145061A58FD407/306D00145061A58FD407/" | xxd -r -p > $@
+
+authorityKeyId_subjectKeyId_issuer_tag1_malformed.crt.der: authorityKeyId_subjectKeyId.crt.der
+	hexdump -ve '1/1 "%.2X"' $< | sed "s/A13FA43D303B310B3009/003FA43D303B310B3009/" | xxd -r -p > $@
+
+authorityKeyId_subjectKeyId_issuer_tag2_malformed.crt.der: authorityKeyId_subjectKeyId.crt.der
+	hexdump -ve '1/1 "%.2X"' $< | sed "s/A43D303B310B30090603/003D303B310B30090603/" | xxd -r -p > $@
+
 ################################################################
 #### Generate various RSA keys
 ################################################################
diff --git a/tests/data_files/authorityKeyId_subjectKeyId.conf b/tests/data_files/authorityKeyId_subjectKeyId.conf
new file mode 100644
index 000000000..208082d20
--- /dev/null
+++ b/tests/data_files/authorityKeyId_subjectKeyId.conf
@@ -0,0 +1,11 @@
+[req]
+distinguished_name = req_distinguished_name
+x509_extensions = v3_req
+prompt = no
+[req_distinguished_name]
+countryName = NL
+organizationalUnitName = PolarSSL
+commonName = PolarSSL Test CA
+[v3_req]
+subjectKeyIdentifier = hash
+authorityKeyIdentifier = keyid:always,issuer:always
diff --git a/tests/data_files/authorityKeyId_subjectKeyId.crt.der b/tests/data_files/authorityKeyId_subjectKeyId.crt.der
new file mode 100644
index 0000000000000000000000000000000000000000..dbbe51866b15d91efa225450b203d954d4d098d6
GIT binary patch
literal 536
zcmXqLViGZEV%)ianTe5!NyIYY{k^b~d-By~Vl&V8#W49PObIgJV&l+i^EhYA!pvk~
zZOCoF$;KSY!Y0h*=VK^nzz^bZ^Kb;@=Oh*d2m2UG8i<30n0W+XLJA?N#U%>Pjs|k#
zyhg?bCI)5(=7ts~hEd|YCLpdMluMc6kp{wS>|l2?F+v^8%*f8{#K2;HChTSzr(9H#
z-SJ4>{|b5UYJRd!EV-~&Wb5|~rO2d7eoq;0C=337rGLpJHdbtJSI433a^BFhU0Qs<
z7*A|@`+srcEQ7}B2C_hJ$?~y?v4{jDF73a<e)D=0BhS;+`krLB<-+?6%0SY}Ecphx
z4OkT{v|nONkq?^)#tyS5gMk~9B18YAw%j|<6|G);wiJ&%?3G(A$9TMdR`x6Nq)p#_
sD!-`%m0XzIcTn-!w<S9!9Qi4*;@<byX?dT8ZY`Lly?)P!GtA2M083A)+5i9m

literal 0
HcmV?d00001

diff --git a/tests/data_files/authorityKeyId_subjectKeyId_issuer_tag1_malformed.crt.der b/tests/data_files/authorityKeyId_subjectKeyId_issuer_tag1_malformed.crt.der
new file mode 100644
index 0000000000000000000000000000000000000000..6f9ce685e75726d64f19385f625943d490913957
GIT binary patch
literal 536
zcmXqLViGZEV%)ianTe5!NyIYY{k^b~d-By~Vl&V8#W49PObIgJV&l+i^EhYA!pvk~
zZOCoF$;KSY!Y0h*=VK^nzz^bZ^Kb;@=Oh*d2m2UG8i<30n0W+XLJA?N#U%>Pjs|k#
zyhg?bCI)5(=7ts~hEd|YCLpdMluMc6kp{wS>|l2?F+v^8%*f8{#K2;HChTSzr(9H#
z-SJ4>{|b5UYJRd!EV-~&Wb5|~rO2d7eoq;0C=337rGLpJHdbtJSI433a^BFhU0Qs<
z7*A|@`+srcEQ7}B2C_hJ$?~y?v4{jDF73a<e)D=0BhS;+`krLB<-+?6%0SY}Ecphx
z4OkU0*e|iA$cIe?V~5$3!N844k)eN5Tkf6bidHW^TZ%^>_R1}mV?5qJEBlps(x&e|
smEY8XN-j+9JE-{V+mam<j{Fo@aqs)<w7kzkw-(IOUccwV8D`~r0Nv85IRF3v

literal 0
HcmV?d00001

diff --git a/tests/data_files/authorityKeyId_subjectKeyId_issuer_tag2_malformed.crt.der b/tests/data_files/authorityKeyId_subjectKeyId_issuer_tag2_malformed.crt.der
new file mode 100644
index 0000000000000000000000000000000000000000..c96704338b6b706ac9632865bc0295fafe1c3231
GIT binary patch
literal 536
zcmXqLViGZEV%)ianTe5!NyIYY{k^b~d-By~Vl&V8#W49PObIgJV&l+i^EhYA!pvk~
zZOCoF$;KSY!Y0h*=VK^nzz^bZ^Kb;@=Oh*d2m2UG8i<30n0W+XLJA?N#U%>Pjs|k#
zyhg?bCI)5(=7ts~hEd|YCLpdMluMc6kp{wS>|l2?F+v^8%*f8{#K2;HChTSzr(9H#
z-SJ4>{|b5UYJRd!EV-~&Wb5|~rO2d7eoq;0C=337rGLpJHdbtJSI433a^BFhU0Qs<
z7*A|@`+srcEQ7}B2C_hJ$?~y?v4{jDF73a<e)D=0BhS;+`krLB<-+?6%0SY}Ecphx
z4OkT{v}drT$cIe?V~5$3!N844k)eN5Tkf6bidHW^TZ%^>_R1}mV?5qJEBlps(x&e|
smEY8XN-j+9JE-{V+mam<j{Fo@aqs)<w7kzkw-(IOUccwV8D`~r0NoI&HUIzs

literal 0
HcmV?d00001

diff --git a/tests/data_files/authorityKeyId_subjectKeyId_keyid_tag_malformed.crt.der b/tests/data_files/authorityKeyId_subjectKeyId_keyid_tag_malformed.crt.der
new file mode 100644
index 0000000000000000000000000000000000000000..be798cc12b1e3475c850b8c22c9f617f7d6db4a8
GIT binary patch
literal 536
zcmXqLViGZEV%)ianTe5!NyIYY{k^b~d-By~Vl&V8#W49PObIgJV&l+i^EhYA!pvk~
zZOCoF$;KSY!Y0h*=VK^nzz^bZ^Kb;@=Oh*d2m2UG8i<30n0W+XLJA?N#U%>Pjs|k#
zyhg?bCI)5(=7ts~hEd|YCLpdMluMc6kp{wS>|l2?F+v^8%*f8{#K2;HChTSzr(9H#
z-SJ4>{|b5UYJRd!EV-~&Wb5|~rO2d7eoq;0C=337rGLpJHdbtJSI433a^BFhU0Qs<
z7*A|@`+srcEQ7}B2C_hJ$?~y?v4{jDF73a<e)D=0BhS;+`krLB<-+?6%0SY}Ecphx
z3|JK`v|nONkq?^)#tyS5gMk~9B18YAw%j|<6|G);wiJ&%?3G(A$9TMdR`x6Nq)p#_
sD!-`%m0XzIcTn-!w<S9!9Qi4*;@<byX?dT8ZY`Lly?)P!GtA2M0O>%fS^xk5

literal 0
HcmV?d00001

diff --git a/tests/data_files/authorityKeyId_subjectKeyId_length_malformed.crt.der b/tests/data_files/authorityKeyId_subjectKeyId_length_malformed.crt.der
new file mode 100644
index 0000000000000000000000000000000000000000..3f9e8709637e02b2a3a2288656955418a1c2f9b5
GIT binary patch
literal 536
zcmXqLViGZEV%)ianTe5!NyIYY{k^b~d-By~Vl&V8#W49PObIgJV&l+i^EhYA!pvk~
zZOCoF$;KSY!Y0h*=VK^nzz^bZ^Kb;@=Oh*d2m2UG8i<30n0W+XLJA?N#U%>Pjs|k#
zyhg?bCI)5(=7ts~hEd|YCLpdMluMc6kp{wS>|l2?F+v^8%*f8{#K2;HChTSzr(9H#
z-SJ4>{|b5UYJRd!EV-~&Wb5|~rO2d7eoq;0C=337rGLpJHdbtJSI433a^BFhU0Qs<
z7*A|@`+srcEQ7}B2C_hJ$?~y?v4{jDF73a<e)D=0BhS;+`krLB<-+?6%0SY}EcpgG
z4OkT{v|nONkq?^)#tyS5gMk~9B18YAw%j|<6|G);wiJ&%?3G(A$9TMdR`x6Nq)p#_
sD!-`%m0XzIcTn-!w<S9!9Qi4*;@<byX?dT8ZY`Lly?)P!GtA2M07{Cf*#H0l

literal 0
HcmV?d00001

diff --git a/tests/data_files/authorityKeyId_subjectKeyId_sequence_tag_malformed.crt.der b/tests/data_files/authorityKeyId_subjectKeyId_sequence_tag_malformed.crt.der
new file mode 100644
index 0000000000000000000000000000000000000000..5a4b3624c71ca5a7705442eecf86b13bc280399e
GIT binary patch
literal 536
zcmXqLViGZEV%)ianTe5!NyIYY{k^b~d-By~Vl&V8#W49PObIgJV&l+i^EhYA!pvk~
zZOCoF$;KSY!Y0h*=VK^nzz^bZ^Kb;@=Oh*d2m2UG8i<30n0W+XLJA?N#U%>Pjs|k#
zyhg?bCI)5(=7ts~hEd|YCLpdMluMc6kp{wS>|l2?F+v^8%*f8{#K2;HChTSzr(9H#
z-SJ4>{|b5UYJRd!EV-~&Wb5|~rO2d7eoq;0C=337rGLpJHdbtJSI433a^BFhU0Qs<
z7*A|@`+srcEQ7}B2C_hJ$?~y?v4{jDF73a<e)D=0BhS;+`krLB<-+?6%0SY}Ecpz%
z4OkT{v|nONkq?^)#tyS5gMk~9B18YAw%j|<6|G);wiJ&%?3G(A$9TMdR`x6Nq)p#_
sD!-`%m0XzIcTn-!w<S9!9Qi4*;@<byX?dT8ZY`Lly?)P!GtA2M046V~ssI20

literal 0
HcmV?d00001

diff --git a/tests/data_files/authorityKeyId_subjectKeyId_tag_malformed.crt.der b/tests/data_files/authorityKeyId_subjectKeyId_tag_malformed.crt.der
new file mode 100644
index 0000000000000000000000000000000000000000..b0ba18ead0d94d4d5179dc70fc88612e01a6f547
GIT binary patch
literal 536
zcmXqLViGZEV%)ianTe5!NyIYY{k^b~d-By~Vl&V8#W49PObIgJV&l+i^EhYA!pvk~
zZOCoF$;KSY!Y0h*=VK^nzz^bZ^Kb;@=Oh*d2m2UG8i<30n0W+XLJA?N#U%>Pjs|k#
zyhg?bCI)5(=7ts~hEd|YCLpdMluMc6kp{wS>|l2?F+v^8%*f8{#K2;HChTSzr(9H#
z-SJ4>{|b5UYJRd!EV-~&Wb5|~rO2d7eoq;0C=337rGLpJHdbtJSI433a^BFhU0Qs<
z7*A|@`+srcEQ7}B2C_hJ$?~y?F^U8vF73a<e)D=0BhS;+`krLB<-+?6%0SY}Ecphx
z4OkT{v|nONkq?^)#tyS5gMk~9B18YAw%j|<6|G);wiJ&%?3G(A$9TMdR`x6Nq)p#_
sD!-`%m0XzIcTn-!w<S9!9Qi4*;@<byX?dT8ZY`Lly?)P!GtA2M07#&z*8l(j

literal 0
HcmV?d00001


From 2568d479165a9f3124caf1be1c990628f377dd68 Mon Sep 17 00:00:00 2001
From: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
Date: Thu, 6 Apr 2023 09:23:25 +0200
Subject: [PATCH 02/14] Use generated certs in DER format in tests

Signed-off-by: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
---
 tests/suites/test_suite_x509parse.data     | 16 ++++++++--------
 tests/suites/test_suite_x509parse.function | 10 +++++-----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/tests/suites/test_suite_x509parse.data b/tests/suites/test_suite_x509parse.data
index 36f1df1ba..ffd2ed54c 100644
--- a/tests/suites/test_suite_x509parse.data
+++ b/tests/suites/test_suite_x509parse.data
@@ -3303,27 +3303,27 @@ x509_accessor_ext_types:MBEDTLS_X509_EXT_KEY_USAGE:MBEDTLS_X509_EXT_SUBJECT_ALT_
 
 X509 CRT parse Subject Key Id - Correct Subject Key ID
 depends_on:MBEDTLS_MD_CAN_SHA1:MBEDTLS_RSA_C
-x509_crt_parse_subjectkeyid:"308203873082026fa003020102020100300d06092a864886f70d0101050500303b310b3009060355040613024e4c3111300f060355040a1308506f6c617253534c3119301706035504031310506f6c617253534c2054657374204341301e170d3131303231323134343430305a170d3231303231323134343430305a303b310b3009060355040613024e4c3111300f060355040a1308506f6c617253534c3119301706035504031310506f6c617253534c205465737420434130820122300d06092a864886f70d01010105000382010f003082010a0282010100c0df37fc17bbe0969d3f86de96327d44a516a0cd21f199d4eceacb7c18580894a5ec9bc58bdf1a1e993899871e7bc08d39df385d707807d39ed993e8b97251c5cea33052a9f2e7407014cb44a2720bc2e540f93ee5a60eb3f9ec4a63c0b82900749c573ba8a5049071f1bd83d93fd6a5e23c2a8fef2760c3c69fcbbaec607db7e68432be4ffb582622035bd4b4d5fbf5e3962e70c0e42ebdfc2eeee24155c0342e7d247269cb47b11440837d67f486f631abf179a4b2b52e12f98417f0626f273e1358b1540d219a7337a130cf6f92dcf6e9fcacdb2e28d17e024b23a015f238656409ea0c6e8e1b17a071c8b39bc9abe9c3f2cf87968f8002329e99586fa2d50203010001a38195308192300c0603551d13040530030101ff301d0603551d0e04160414b45ae4a5b3ded252f6b9d5a6950feb3ebcc7fdff30630603551d23045c305a8014b45ae4a5b3ded252f6b9d5a6950feb3ebcc7fdffa13fa43d303b310b3009060355040613024e4c3111300f060355040a1308506f6c617253534c3119301706035504031310506f6c617253534c2054657374204341820100300d06092a864886f70d01010505000382010100b8fd54d80054908b25b027dd95cda2f784071d87894ac47811d807b5d722508e48eb627a3289be634753ffb6bef12e8c54c0993fa0b93723725f0d46598fd847cd974c9f070c1262093a24e436d9e92cda38d0737561d7c16c268b9be0d5dc67ed8c6b33d774223c4cdbb58d2ace2c0d0859050905a6399fb3671be283e5e18f53f66793c7f96f76445812e83ad497e7e9c03ea87a723d87531fe52c8484e79a9e7f66d91f9bf51348b04d14d1deb224d9787df535cc5819d1d299ef4d73f81f89d45ad052ce09f5b146516a008e3bcc6f63010099ed9da60860cd3218d073e05871d9e5d253d78dd0cae95d2a0a0d5d55ec21501716e6064acd5edef7e0e954":20:0
+x509_crt_parse_subjectkeyid:"data_files/authorityKeyId_subjectKeyId.crt.der":20:0
 
 X509 CRT parse Subject Key Id - Wrong OCTET_STRING tag
 depends_on:MBEDTLS_MD_CAN_SHA1:MBEDTLS_RSA_C
-x509_crt_parse_subjectkeyid:"308203873082026fa003020102020100300d06092a864886f70d0101050500303b310b3009060355040613024e4c3111300f060355040a1308506f6c617253534c3119301706035504031310506f6c617253534c2054657374204341301e170d3131303231323134343430305a170d3231303231323134343430305a303b310b3009060355040613024e4c3111300f060355040a1308506f6c617253534c3119301706035504031310506f6c617253534c205465737420434130820122300d06092a864886f70d01010105000382010f003082010a0282010100c0df37fc17bbe0969d3f86de96327d44a516a0cd21f199d4eceacb7c18580894a5ec9bc58bdf1a1e993899871e7bc08d39df385d707807d39ed993e8b97251c5cea33052a9f2e7407014cb44a2720bc2e540f93ee5a60eb3f9ec4a63c0b82900749c573ba8a5049071f1bd83d93fd6a5e23c2a8fef2760c3c69fcbbaec607db7e68432be4ffb582622035bd4b4d5fbf5e3962e70c0e42ebdfc2eeee24155c0342e7d247269cb47b11440837d67f486f631abf179a4b2b52e12f98417f0626f273e1358b1540d219a7337a130cf6f92dcf6e9fcacdb2e28d17e024b23a015f238656409ea0c6e8e1b17a071c8b39bc9abe9c3f2cf87968f8002329e99586fa2d50203010001a38195308192300c0603551d13040530030101ff301d0603551d0e04160014b45ae4a5b3ded252f6b9d5a6950feb3ebcc7fdff30630603551d23045c305a8014b45ae4a5b3ded252f6b9d5a6950feb3ebcc7fdffa13fa43d303b310b3009060355040613024e4c3111300f060355040a1308506f6c617253534c3119301706035504031310506f6c617253534c2054657374204341820100300d06092a864886f70d01010505000382010100b8fd54d80054908b25b027dd95cda2f784071d87894ac47811d807b5d722508e48eb627a3289be634753ffb6bef12e8c54c0993fa0b93723725f0d46598fd847cd974c9f070c1262093a24e436d9e92cda38d0737561d7c16c268b9be0d5dc67ed8c6b33d774223c4cdbb58d2ace2c0d0859050905a6399fb3671be283e5e18f53f66793c7f96f76445812e83ad497e7e9c03ea87a723d87531fe52c8484e79a9e7f66d91f9bf51348b04d14d1deb224d9787df535cc5819d1d299ef4d73f81f89d45ad052ce09f5b146516a008e3bcc6f63010099ed9da60860cd3218d073e05871d9e5d253d78dd0cae95d2a0a0d5d55ec21501716e6064acd5edef7e0e954":0:MBEDTLS_ERR_X509_INVALID_EXTENSIONS+MBEDTLS_ERR_ASN1_UNEXPECTED_TAG
+x509_crt_parse_subjectkeyid:"data_files/authorityKeyId_subjectKeyId_tag_malformed.crt.der":0:MBEDTLS_ERR_X509_INVALID_EXTENSIONS+MBEDTLS_ERR_ASN1_UNEXPECTED_TAG
 
 X509 CRT parse Authority Key Id - Correct Authority Key ID
 depends_on:MBEDTLS_MD_CAN_SHA1:MBEDTLS_RSA_C
-x509_crt_parse_authoritykeyid:"308203873082026fa003020102020100300d06092a864886f70d0101050500303b310b3009060355040613024e4c3111300f060355040a1308506f6c617253534c3119301706035504031310506f6c617253534c2054657374204341301e170d3131303231323134343430305a170d3231303231323134343430305a303b310b3009060355040613024e4c3111300f060355040a1308506f6c617253534c3119301706035504031310506f6c617253534c205465737420434130820122300d06092a864886f70d01010105000382010f003082010a0282010100c0df37fc17bbe0969d3f86de96327d44a516a0cd21f199d4eceacb7c18580894a5ec9bc58bdf1a1e993899871e7bc08d39df385d707807d39ed993e8b97251c5cea33052a9f2e7407014cb44a2720bc2e540f93ee5a60eb3f9ec4a63c0b82900749c573ba8a5049071f1bd83d93fd6a5e23c2a8fef2760c3c69fcbbaec607db7e68432be4ffb582622035bd4b4d5fbf5e3962e70c0e42ebdfc2eeee24155c0342e7d247269cb47b11440837d67f486f631abf179a4b2b52e12f98417f0626f273e1358b1540d219a7337a130cf6f92dcf6e9fcacdb2e28d17e024b23a015f238656409ea0c6e8e1b17a071c8b39bc9abe9c3f2cf87968f8002329e99586fa2d50203010001a38195308192300c0603551d13040530030101ff301d0603551d0e04160414b45ae4a5b3ded252f6b9d5a6950feb3ebcc7fdff30630603551d23045c305a8014b45ae4a5b3ded252f6b9d5a6950feb3ebcc7fdffa13fa43d303b310b3009060355040613024e4c3111300f060355040a1308506f6c617253534c3119301706035504031310506f6c617253534c2054657374204341820100300d06092a864886f70d01010505000382010100b8fd54d80054908b25b027dd95cda2f784071d87894ac47811d807b5d722508e48eb627a3289be634753ffb6bef12e8c54c0993fa0b93723725f0d46598fd847cd974c9f070c1262093a24e436d9e92cda38d0737561d7c16c268b9be0d5dc67ed8c6b33d774223c4cdbb58d2ace2c0d0859050905a6399fb3671be283e5e18f53f66793c7f96f76445812e83ad497e7e9c03ea87a723d87531fe52c8484e79a9e7f66d91f9bf51348b04d14d1deb224d9787df535cc5819d1d299ef4d73f81f89d45ad052ce09f5b146516a008e3bcc6f63010099ed9da60860cd3218d073e05871d9e5d253d78dd0cae95d2a0a0d5d55ec21501716e6064acd5edef7e0e954":20:"NL/PolarSSL/PolarSSL Test CA/":1:0
+x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_subjectKeyId.crt.der":20:"NL/PolarSSL/PolarSSL Test CA/":20:0
 
 X509 CRT parse Authority Key Id - Wrong Length
 depends_on:MBEDTLS_MD_CAN_SHA1:MBEDTLS_RSA_C
-x509_crt_parse_authoritykeyid:"308203873082026fa003020102020100300d06092a864886f70d0101050500303b310b3009060355040613024e4c3111300f060355040a1308506f6c617253534c3119301706035504031310506f6c617253534c2054657374204341301e170d3131303231323134343430305a170d3231303231323134343430305a303b310b3009060355040613024e4c3111300f060355040a1308506f6c617253534c3119301706035504031310506f6c617253534c205465737420434130820122300d06092a864886f70d01010105000382010f003082010a0282010100c0df37fc17bbe0969d3f86de96327d44a516a0cd21f199d4eceacb7c18580894a5ec9bc58bdf1a1e993899871e7bc08d39df385d707807d39ed993e8b97251c5cea33052a9f2e7407014cb44a2720bc2e540f93ee5a60eb3f9ec4a63c0b82900749c573ba8a5049071f1bd83d93fd6a5e23c2a8fef2760c3c69fcbbaec607db7e68432be4ffb582622035bd4b4d5fbf5e3962e70c0e42ebdfc2eeee24155c0342e7d247269cb47b11440837d67f486f631abf179a4b2b52e12f98417f0626f273e1358b1540d219a7337a130cf6f92dcf6e9fcacdb2e28d17e024b23a015f238656409ea0c6e8e1b17a071c8b39bc9abe9c3f2cf87968f8002329e99586fa2d50203010001a38195308192300c0603551d13040530030101ff301d0603551d0e04160414b45ae4a5b3ded252f6b9d5a6950feb3ebcc7fdff30630603551d23045c30598014b45ae4a5b3ded252f6b9d5a6950feb3ebcc7fdffa13fa43d303b310b3009060355040613024e4c3111300f060355040a1308506f6c617253534c3119301706035504031310506f6c617253534c2054657374204341820100300d06092a864886f70d01010505000382010100b8fd54d80054908b25b027dd95cda2f784071d87894ac47811d807b5d722508e48eb627a3289be634753ffb6bef12e8c54c0993fa0b93723725f0d46598fd847cd974c9f070c1262093a24e436d9e92cda38d0737561d7c16c268b9be0d5dc67ed8c6b33d774223c4cdbb58d2ace2c0d0859050905a6399fb3671be283e5e18f53f66793c7f96f76445812e83ad497e7e9c03ea87a723d87531fe52c8484e79a9e7f66d91f9bf51348b04d14d1deb224d9787df535cc5819d1d299ef4d73f81f89d45ad052ce09f5b146516a008e3bcc6f63010099ed9da60860cd3218d073e05871d9e5d253d78dd0cae95d2a0a0d5d55ec21501716e6064acd5edef7e0e954":0:"":0:MBEDTLS_ERR_X509_INVALID_EXTENSIONS+MBEDTLS_ERR_ASN1_LENGTH_MISMATCH
+x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_subjectKeyId_length_malformed.crt.der":0:"":0:MBEDTLS_ERR_X509_INVALID_EXTENSIONS+MBEDTLS_ERR_ASN1_LENGTH_MISMATCH
 
 X509 CRT parse Authority Key Id - Wrong Sequence tag
 depends_on:MBEDTLS_MD_CAN_SHA1:MBEDTLS_RSA_C
-x509_crt_parse_authoritykeyid:"308203873082026fa003020102020100300d06092a864886f70d0101050500303b310b3009060355040613024e4c3111300f060355040a1308506f6c617253534c3119301706035504031310506f6c617253534c2054657374204341301e170d3131303231323134343430305a170d3231303231323134343430305a303b310b3009060355040613024e4c3111300f060355040a1308506f6c617253534c3119301706035504031310506f6c617253534c205465737420434130820122300d06092a864886f70d01010105000382010f003082010a0282010100c0df37fc17bbe0969d3f86de96327d44a516a0cd21f199d4eceacb7c18580894a5ec9bc58bdf1a1e993899871e7bc08d39df385d707807d39ed993e8b97251c5cea33052a9f2e7407014cb44a2720bc2e540f93ee5a60eb3f9ec4a63c0b82900749c573ba8a5049071f1bd83d93fd6a5e23c2a8fef2760c3c69fcbbaec607db7e68432be4ffb582622035bd4b4d5fbf5e3962e70c0e42ebdfc2eeee24155c0342e7d247269cb47b11440837d67f486f631abf179a4b2b52e12f98417f0626f273e1358b1540d219a7337a130cf6f92dcf6e9fcacdb2e28d17e024b23a015f238656409ea0c6e8e1b17a071c8b39bc9abe9c3f2cf87968f8002329e99586fa2d50203010001a38195308192300c0603551d13040530030101ff301d0603551d0e04160414b45ae4a5b3ded252f6b9d5a6950feb3ebcc7fdff30630603551d23045c005a8014b45ae4a5b3ded252f6b9d5a6950feb3ebcc7fdffa13fa43d303b310b3009060355040613024e4c3111300f060355040a1308506f6c617253534c3119301706035504031310506f6c617253534c2054657374204341820100300d06092a864886f70d01010505000382010100b8fd54d80054908b25b027dd95cda2f784071d87894ac47811d807b5d722508e48eb627a3289be634753ffb6bef12e8c54c0993fa0b93723725f0d46598fd847cd974c9f070c1262093a24e436d9e92cda38d0737561d7c16c268b9be0d5dc67ed8c6b33d774223c4cdbb58d2ace2c0d0859050905a6399fb3671be283e5e18f53f66793c7f96f76445812e83ad497e7e9c03ea87a723d87531fe52c8484e79a9e7f66d91f9bf51348b04d14d1deb224d9787df535cc5819d1d299ef4d73f81f89d45ad052ce09f5b146516a008e3bcc6f63010099ed9da60860cd3218d073e05871d9e5d253d78dd0cae95d2a0a0d5d55ec21501716e6064acd5edef7e0e954":0:"":0:MBEDTLS_ERR_X509_INVALID_EXTENSIONS+MBEDTLS_ERR_ASN1_UNEXPECTED_TAG
+x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_subjectKeyId_sequence_tag_malformed.crt.der":0:"":0:MBEDTLS_ERR_X509_INVALID_EXTENSIONS+MBEDTLS_ERR_ASN1_UNEXPECTED_TAG
 
 X509 CRT parse Authority Key Id - Wrong KeyId Tag
 depends_on:MBEDTLS_MD_CAN_SHA1:MBEDTLS_RSA_C
-x509_crt_parse_authoritykeyid:"308203873082026fa003020102020100300d06092a864886f70d0101050500303b310b3009060355040613024e4c3111300f060355040a1308506f6c617253534c3119301706035504031310506f6c617253534c2054657374204341301e170d3131303231323134343430305a170d3231303231323134343430305a303b310b3009060355040613024e4c3111300f060355040a1308506f6c617253534c3119301706035504031310506f6c617253534c205465737420434130820122300d06092a864886f70d01010105000382010f003082010a0282010100c0df37fc17bbe0969d3f86de96327d44a516a0cd21f199d4eceacb7c18580894a5ec9bc58bdf1a1e993899871e7bc08d39df385d707807d39ed993e8b97251c5cea33052a9f2e7407014cb44a2720bc2e540f93ee5a60eb3f9ec4a63c0b82900749c573ba8a5049071f1bd83d93fd6a5e23c2a8fef2760c3c69fcbbaec607db7e68432be4ffb582622035bd4b4d5fbf5e3962e70c0e42ebdfc2eeee24155c0342e7d247269cb47b11440837d67f486f631abf179a4b2b52e12f98417f0626f273e1358b1540d219a7337a130cf6f92dcf6e9fcacdb2e28d17e024b23a015f238656409ea0c6e8e1b17a071c8b39bc9abe9c3f2cf87968f8002329e99586fa2d50203010001a38195308192300c0603551d13040530030101ff301d0603551d0e04160414b45ae4a5b3ded252f6b9d5a6950feb3ebcc7fdff30630603551d23045c305a0014b45ae4a5b3ded252f6b9d5a6950feb3ebcc7fdffa13fa43d303b310b3009060355040613024e4c3111300f060355040a1308506f6c617253534c3119301706035504031310506f6c617253534c2054657374204341820100300d06092a864886f70d01010505000382010100b8fd54d80054908b25b027dd95cda2f784071d87894ac47811d807b5d722508e48eb627a3289be634753ffb6bef12e8c54c0993fa0b93723725f0d46598fd847cd974c9f070c1262093a24e436d9e92cda38d0737561d7c16c268b9be0d5dc67ed8c6b33d774223c4cdbb58d2ace2c0d0859050905a6399fb3671be283e5e18f53f66793c7f96f76445812e83ad497e7e9c03ea87a723d87531fe52c8484e79a9e7f66d91f9bf51348b04d14d1deb224d9787df535cc5819d1d299ef4d73f81f89d45ad052ce09f5b146516a008e3bcc6f63010099ed9da60860cd3218d073e05871d9e5d253d78dd0cae95d2a0a0d5d55ec21501716e6064acd5edef7e0e954":0:"":0:MBEDTLS_ERR_X509_INVALID_EXTENSIONS+MBEDTLS_ERR_ASN1_UNEXPECTED_TAG
+x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_subjectKeyId_keyid_tag_malformed.crt.der":0:"":0:MBEDTLS_ERR_X509_INVALID_EXTENSIONS+MBEDTLS_ERR_ASN1_UNEXPECTED_TAG
 
 X509 CRT parse Authority Key Id - Wrong KeyId Tag Length
 depends_on:MBEDTLS_MD_CAN_SHA256:MBEDTLS_RSA_C
@@ -3331,11 +3331,11 @@ x509_crt_parse_authoritykeyid:"3082039F30820287A00302010202142121EA5121F25E38DF2
 
 X509 CRT parse Authority Key Id - Wrong Issuer Tag 1
 depends_on:MBEDTLS_MD_CAN_SHA1:MBEDTLS_RSA_C
-x509_crt_parse_authoritykeyid:"308203873082026fa003020102020100300d06092a864886f70d0101050500303b310b3009060355040613024e4c3111300f060355040a1308506f6c617253534c3119301706035504031310506f6c617253534c2054657374204341301e170d3131303231323134343430305a170d3231303231323134343430305a303b310b3009060355040613024e4c3111300f060355040a1308506f6c617253534c3119301706035504031310506f6c617253534c205465737420434130820122300d06092a864886f70d01010105000382010f003082010a0282010100c0df37fc17bbe0969d3f86de96327d44a516a0cd21f199d4eceacb7c18580894a5ec9bc58bdf1a1e993899871e7bc08d39df385d707807d39ed993e8b97251c5cea33052a9f2e7407014cb44a2720bc2e540f93ee5a60eb3f9ec4a63c0b82900749c573ba8a5049071f1bd83d93fd6a5e23c2a8fef2760c3c69fcbbaec607db7e68432be4ffb582622035bd4b4d5fbf5e3962e70c0e42ebdfc2eeee24155c0342e7d247269cb47b11440837d67f486f631abf179a4b2b52e12f98417f0626f273e1358b1540d219a7337a130cf6f92dcf6e9fcacdb2e28d17e024b23a015f238656409ea0c6e8e1b17a071c8b39bc9abe9c3f2cf87968f8002329e99586fa2d50203010001a38195308192300c0603551d13040530030101ff301d0603551d0e04160414b45ae4a5b3ded252f6b9d5a6950feb3ebcc7fdff30630603551d23045c305a8014b45ae4a5b3ded252f6b9d5a6950feb3ebcc7fdff003fa43d303b310b3009060355040613024e4c3111300f060355040a1308506f6c617253534c3119301706035504031310506f6c617253534c2054657374204341820100300d06092a864886f70d01010505000382010100b8fd54d80054908b25b027dd95cda2f784071d87894ac47811d807b5d722508e48eb627a3289be634753ffb6bef12e8c54c0993fa0b93723725f0d46598fd847cd974c9f070c1262093a24e436d9e92cda38d0737561d7c16c268b9be0d5dc67ed8c6b33d774223c4cdbb58d2ace2c0d0859050905a6399fb3671be283e5e18f53f66793c7f96f76445812e83ad497e7e9c03ea87a723d87531fe52c8484e79a9e7f66d91f9bf51348b04d14d1deb224d9787df535cc5819d1d299ef4d73f81f89d45ad052ce09f5b146516a008e3bcc6f63010099ed9da60860cd3218d073e05871d9e5d253d78dd0cae95d2a0a0d5d55ec21501716e6064acd5edef7e0e954":0:"":0:MBEDTLS_ERR_X509_INVALID_EXTENSIONS+MBEDTLS_ERR_ASN1_UNEXPECTED_TAG
+x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_subjectKeyId_issuer_tag1_malformed.crt.der":0:"":0:MBEDTLS_ERR_X509_INVALID_EXTENSIONS+MBEDTLS_ERR_ASN1_UNEXPECTED_TAG
 
 X509 CRT parse Authority Key Id - Wrong Issuer Tag 2
 depends_on:MBEDTLS_MD_CAN_SHA1:MBEDTLS_RSA_C
-x509_crt_parse_authoritykeyid:"308203873082026fa003020102020100300d06092a864886f70d0101050500303b310b3009060355040613024e4c3111300f060355040a1308506f6c617253534c3119301706035504031310506f6c617253534c2054657374204341301e170d3131303231323134343430305a170d3231303231323134343430305a303b310b3009060355040613024e4c3111300f060355040a1308506f6c617253534c3119301706035504031310506f6c617253534c205465737420434130820122300d06092a864886f70d01010105000382010f003082010a0282010100c0df37fc17bbe0969d3f86de96327d44a516a0cd21f199d4eceacb7c18580894a5ec9bc58bdf1a1e993899871e7bc08d39df385d707807d39ed993e8b97251c5cea33052a9f2e7407014cb44a2720bc2e540f93ee5a60eb3f9ec4a63c0b82900749c573ba8a5049071f1bd83d93fd6a5e23c2a8fef2760c3c69fcbbaec607db7e68432be4ffb582622035bd4b4d5fbf5e3962e70c0e42ebdfc2eeee24155c0342e7d247269cb47b11440837d67f486f631abf179a4b2b52e12f98417f0626f273e1358b1540d219a7337a130cf6f92dcf6e9fcacdb2e28d17e024b23a015f238656409ea0c6e8e1b17a071c8b39bc9abe9c3f2cf87968f8002329e99586fa2d50203010001a38195308192300c0603551d13040530030101ff301d0603551d0e04160414b45ae4a5b3ded252f6b9d5a6950feb3ebcc7fdff30630603551d23045c305a8014b45ae4a5b3ded252f6b9d5a6950feb3ebcc7fdffa13f003d303b310b3009060355040613024e4c3111300f060355040a1308506f6c617253534c3119301706035504031310506f6c617253534c2054657374204341820100300d06092a864886f70d01010505000382010100b8fd54d80054908b25b027dd95cda2f784071d87894ac47811d807b5d722508e48eb627a3289be634753ffb6bef12e8c54c0993fa0b93723725f0d46598fd847cd974c9f070c1262093a24e436d9e92cda38d0737561d7c16c268b9be0d5dc67ed8c6b33d774223c4cdbb58d2ace2c0d0859050905a6399fb3671be283e5e18f53f66793c7f96f76445812e83ad497e7e9c03ea87a723d87531fe52c8484e79a9e7f66d91f9bf51348b04d14d1deb224d9787df535cc5819d1d299ef4d73f81f89d45ad052ce09f5b146516a008e3bcc6f63010099ed9da60860cd3218d073e05871d9e5d253d78dd0cae95d2a0a0d5d55ec21501716e6064acd5edef7e0e954":0:"":0:MBEDTLS_ERR_X509_INVALID_EXTENSIONS+MBEDTLS_ERR_ASN1_UNEXPECTED_TAG
+x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_subjectKeyId_issuer_tag2_malformed.crt.der":0:"":0:MBEDTLS_ERR_X509_INVALID_EXTENSIONS+MBEDTLS_ERR_ASN1_UNEXPECTED_TAG
 
 # clusterfuzz-testcase-minimized-fuzz_x509crt-6666050834661376: test for bad sequence of names in authorityCertIssuer
 X509 CRT parse Authority Key Id - Wrong Issuer sequence
diff --git a/tests/suites/test_suite_x509parse.function b/tests/suites/test_suite_x509parse.function
index f215a8069..bea4722c3 100644
--- a/tests/suites/test_suite_x509parse.function
+++ b/tests/suites/test_suite_x509parse.function
@@ -1550,14 +1550,14 @@ exit:
 /* END_CASE */
 
 /* BEGIN_CASE depends_on:MBEDTLS_X509_CRT_PARSE_C */
-void x509_crt_parse_subjectkeyid(data_t *buf, int subjectKeyIdLength_arg, int ref_ret)
+void x509_crt_parse_subjectkeyid(char *file, int subjectKeyIdLength, int ref_ret)
 {
     size_t subjectKeyIdLength = subjectKeyIdLength_arg;
     mbedtls_x509_crt crt;
 
     mbedtls_x509_crt_init(&crt);
 
-    TEST_ASSERT(mbedtls_x509_crt_parse_der(&crt, buf->x, buf->len) == ref_ret);
+    TEST_ASSERT(mbedtls_x509_crt_parse_file(&crt, file) == ref_ret);
 
     if (ref_ret == 0) {
         TEST_ASSERT(crt.subject_key_id.tag == MBEDTLS_ASN1_OCTET_STRING);
@@ -1573,8 +1573,8 @@ exit:
 /* END_CASE */
 
 /* BEGIN_CASE depends_on:MBEDTLS_X509_CRT_PARSE_C */
-void x509_crt_parse_authoritykeyid(data_t *buf,
-                                   int keyIdLength_arg,
+void x509_crt_parse_authoritykeyid(char *file,
+                                   int keyIdLength,
                                    char *authorityKeyId_issuer,
                                    int serialLength_arg,
                                    int ref_ret)
@@ -1590,7 +1590,7 @@ void x509_crt_parse_authoritykeyid(data_t *buf,
 
     mbedtls_x509_crt_init(&crt);
 
-    TEST_ASSERT(mbedtls_x509_crt_parse_der(&crt, buf->x, buf->len) == ref_ret);
+    TEST_ASSERT(mbedtls_x509_crt_parse_file(&crt, file) == ref_ret);
 
     if (ref_ret == 0) {
         /* KeyId test */

From 0ad1006606af403b63de5d625857da009bd510b6 Mon Sep 17 00:00:00 2001
From: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
Date: Thu, 6 Apr 2023 11:11:58 +0200
Subject: [PATCH 03/14] Check values in tests

Signed-off-by: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
---
 tests/suites/test_suite_x509parse.data     | 16 ++++++++--------
 tests/suites/test_suite_x509parse.function | 17 +++++++++++------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/tests/suites/test_suite_x509parse.data b/tests/suites/test_suite_x509parse.data
index ffd2ed54c..d73476a88 100644
--- a/tests/suites/test_suite_x509parse.data
+++ b/tests/suites/test_suite_x509parse.data
@@ -3303,27 +3303,27 @@ x509_accessor_ext_types:MBEDTLS_X509_EXT_KEY_USAGE:MBEDTLS_X509_EXT_SUBJECT_ALT_
 
 X509 CRT parse Subject Key Id - Correct Subject Key ID
 depends_on:MBEDTLS_MD_CAN_SHA1:MBEDTLS_RSA_C
-x509_crt_parse_subjectkeyid:"data_files/authorityKeyId_subjectKeyId.crt.der":20:0
+x509_crt_parse_subjectkeyid:"data_files/authorityKeyId_subjectKeyId.crt.der":"5061A58FD407D9D782010CE5657F8C6346A713BE":0
 
 X509 CRT parse Subject Key Id - Wrong OCTET_STRING tag
 depends_on:MBEDTLS_MD_CAN_SHA1:MBEDTLS_RSA_C
-x509_crt_parse_subjectkeyid:"data_files/authorityKeyId_subjectKeyId_tag_malformed.crt.der":0:MBEDTLS_ERR_X509_INVALID_EXTENSIONS+MBEDTLS_ERR_ASN1_UNEXPECTED_TAG
+x509_crt_parse_subjectkeyid:"data_files/authorityKeyId_subjectKeyId_tag_malformed.crt.der":"5061A58FD407D9D782010CE5657F8C6346A713BE":MBEDTLS_ERR_X509_INVALID_EXTENSIONS+MBEDTLS_ERR_ASN1_UNEXPECTED_TAG
 
 X509 CRT parse Authority Key Id - Correct Authority Key ID
 depends_on:MBEDTLS_MD_CAN_SHA1:MBEDTLS_RSA_C
-x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_subjectKeyId.crt.der":20:"NL/PolarSSL/PolarSSL Test CA/":20:0
+x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_subjectKeyId.crt.der":"5061A58FD407D9D782010CE5657F8C6346A713BE":"NL/PolarSSL/PolarSSL Test CA/":"3960EFDE5674DE1F7B761699CF8E5C024E209452":0
 
 X509 CRT parse Authority Key Id - Wrong Length
 depends_on:MBEDTLS_MD_CAN_SHA1:MBEDTLS_RSA_C
-x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_subjectKeyId_length_malformed.crt.der":0:"":0:MBEDTLS_ERR_X509_INVALID_EXTENSIONS+MBEDTLS_ERR_ASN1_LENGTH_MISMATCH
+x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_subjectKeyId_length_malformed.crt.der":"":"":"":MBEDTLS_ERR_X509_INVALID_EXTENSIONS+MBEDTLS_ERR_ASN1_LENGTH_MISMATCH
 
 X509 CRT parse Authority Key Id - Wrong Sequence tag
 depends_on:MBEDTLS_MD_CAN_SHA1:MBEDTLS_RSA_C
-x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_subjectKeyId_sequence_tag_malformed.crt.der":0:"":0:MBEDTLS_ERR_X509_INVALID_EXTENSIONS+MBEDTLS_ERR_ASN1_UNEXPECTED_TAG
+x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_subjectKeyId_sequence_tag_malformed.crt.der":"":"":"":MBEDTLS_ERR_X509_INVALID_EXTENSIONS+MBEDTLS_ERR_ASN1_UNEXPECTED_TAG
 
 X509 CRT parse Authority Key Id - Wrong KeyId Tag
 depends_on:MBEDTLS_MD_CAN_SHA1:MBEDTLS_RSA_C
-x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_subjectKeyId_keyid_tag_malformed.crt.der":0:"":0:MBEDTLS_ERR_X509_INVALID_EXTENSIONS+MBEDTLS_ERR_ASN1_UNEXPECTED_TAG
+x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_subjectKeyId_keyid_tag_malformed.crt.der":"":"":"":MBEDTLS_ERR_X509_INVALID_EXTENSIONS+MBEDTLS_ERR_ASN1_UNEXPECTED_TAG
 
 X509 CRT parse Authority Key Id - Wrong KeyId Tag Length
 depends_on:MBEDTLS_MD_CAN_SHA256:MBEDTLS_RSA_C
@@ -3331,11 +3331,11 @@ x509_crt_parse_authoritykeyid:"3082039F30820287A00302010202142121EA5121F25E38DF2
 
 X509 CRT parse Authority Key Id - Wrong Issuer Tag 1
 depends_on:MBEDTLS_MD_CAN_SHA1:MBEDTLS_RSA_C
-x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_subjectKeyId_issuer_tag1_malformed.crt.der":0:"":0:MBEDTLS_ERR_X509_INVALID_EXTENSIONS+MBEDTLS_ERR_ASN1_UNEXPECTED_TAG
+x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_subjectKeyId_issuer_tag1_malformed.crt.der":"":"":"":MBEDTLS_ERR_X509_INVALID_EXTENSIONS+MBEDTLS_ERR_ASN1_UNEXPECTED_TAG
 
 X509 CRT parse Authority Key Id - Wrong Issuer Tag 2
 depends_on:MBEDTLS_MD_CAN_SHA1:MBEDTLS_RSA_C
-x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_subjectKeyId_issuer_tag2_malformed.crt.der":0:"":0:MBEDTLS_ERR_X509_INVALID_EXTENSIONS+MBEDTLS_ERR_ASN1_UNEXPECTED_TAG
+x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_subjectKeyId_issuer_tag2_malformed.crt.der":"":"":"":MBEDTLS_ERR_X509_INVALID_EXTENSIONS+MBEDTLS_ERR_ASN1_UNEXPECTED_TAG
 
 # clusterfuzz-testcase-minimized-fuzz_x509crt-6666050834661376: test for bad sequence of names in authorityCertIssuer
 X509 CRT parse Authority Key Id - Wrong Issuer sequence
diff --git a/tests/suites/test_suite_x509parse.function b/tests/suites/test_suite_x509parse.function
index bea4722c3..89155e958 100644
--- a/tests/suites/test_suite_x509parse.function
+++ b/tests/suites/test_suite_x509parse.function
@@ -1550,7 +1550,7 @@ exit:
 /* END_CASE */
 
 /* BEGIN_CASE depends_on:MBEDTLS_X509_CRT_PARSE_C */
-void x509_crt_parse_subjectkeyid(char *file, int subjectKeyIdLength, int ref_ret)
+void x509_crt_parse_subjectkeyid(char *file, data_t *subjectKeyId, int ref_ret)
 {
     size_t subjectKeyIdLength = subjectKeyIdLength_arg;
     mbedtls_x509_crt crt;
@@ -1561,7 +1561,8 @@ void x509_crt_parse_subjectkeyid(char *file, int subjectKeyIdLength, int ref_ret
 
     if (ref_ret == 0) {
         TEST_ASSERT(crt.subject_key_id.tag == MBEDTLS_ASN1_OCTET_STRING);
-        TEST_ASSERT(crt.subject_key_id.len == subjectKeyIdLength);
+        TEST_ASSERT(memcmp(crt.subject_key_id.p, subjectKeyId->x, subjectKeyId->len) == 0);
+        TEST_ASSERT(crt.subject_key_id.len == subjectKeyId->len);
     } else {
         TEST_ASSERT(crt.subject_key_id.tag == 0);
         TEST_ASSERT(crt.subject_key_id.len == 0);
@@ -1574,9 +1575,9 @@ exit:
 
 /* BEGIN_CASE depends_on:MBEDTLS_X509_CRT_PARSE_C */
 void x509_crt_parse_authoritykeyid(char *file,
-                                   int keyIdLength,
+                                   data_t* keyId,
                                    char *authorityKeyId_issuer,
-                                   int serialLength_arg,
+                                   data_t* serial,
                                    int ref_ret)
 {
     mbedtls_x509_crt crt;
@@ -1595,7 +1596,8 @@ void x509_crt_parse_authoritykeyid(char *file,
     if (ref_ret == 0) {
         /* KeyId test */
         TEST_ASSERT(crt.authority_key_id.keyIdentifier.tag == MBEDTLS_ASN1_OCTET_STRING);
-        TEST_ASSERT(crt.authority_key_id.keyIdentifier.len == keyIdLength);
+        TEST_ASSERT(memcmp(crt.authority_key_id.keyIdentifier.p, keyId->x, keyId->len) == 0);
+        TEST_ASSERT(crt.authority_key_id.keyIdentifier.len == keyId->len);
 
         /* Issuer test */
         mbedtls_x509_sequence *issuerPtr = &crt.authority_key_id.authorityCertIssuer;
@@ -1618,7 +1620,10 @@ void x509_crt_parse_authoritykeyid(char *file,
         /* Serial test */
         TEST_ASSERT(crt.authority_key_id.authorityCertSerialNumber.tag ==
                     MBEDTLS_ASN1_INTEGER);
-        TEST_ASSERT(crt.authority_key_id.authorityCertSerialNumber.len == serialLength);
+        TEST_ASSERT(memcmp(crt.authority_key_id.authorityCertSerialNumber.p,
+                           serial->x, serial->len) == 0);
+        TEST_ASSERT(crt.authority_key_id.authorityCertSerialNumber.len == serial->len);
+
     } else {
         TEST_ASSERT(crt.authority_key_id.keyIdentifier.tag == 0);
         TEST_ASSERT(crt.authority_key_id.keyIdentifier.len == 0);

From 1969f6a453300ab9cb3f46f58acc014ef083c08a Mon Sep 17 00:00:00 2001
From: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
Date: Tue, 18 Apr 2023 08:38:16 +0200
Subject: [PATCH 04/14] Test optional fields in authorityKeyId

Signed-off-by: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
---
 tests/data_files/Makefile                     |  11 +++-
 tests/data_files/authorityKeyId_empty.crt.der | Bin 0 -> 412 bytes
 .../authorityKeyId_no_issuer_serial.crt.der   | Bin 0 -> 412 bytes
 .../authorityKeyId_no_keyid.crt.der           | Bin 0 -> 512 bytes
 .../authorityKeyId_subjectKeyId.conf          |   7 +++
 tests/suites/test_suite_x509parse.data        |  12 +++++
 tests/suites/test_suite_x509parse.function    |  47 +++++++++++-------
 7 files changed, 57 insertions(+), 20 deletions(-)
 create mode 100644 tests/data_files/authorityKeyId_empty.crt.der
 create mode 100644 tests/data_files/authorityKeyId_no_issuer_serial.crt.der
 create mode 100644 tests/data_files/authorityKeyId_no_keyid.crt.der

diff --git a/tests/data_files/Makefile b/tests/data_files/Makefile
index 702aefb6d..461ad8bc9 100644
--- a/tests/data_files/Makefile
+++ b/tests/data_files/Makefile
@@ -551,7 +551,16 @@ crl_cat_rsa-ec.pem:crl.pem crl-ec-sha256.pem
 all_final += crl_cat_ec-rsa.pem crl_cat_rsa-ec.pem
 
 authorityKeyId_subjectKeyId.crt.der:
-	$(OPENSSL) req -x509 -nodes -days 7300 -key server5.key -outform DER -out authorityKeyId_subjectKeyId.crt.der -config authorityKeyId_subjectKeyId.conf -extensions 'v3_req'
+	$(OPENSSL) req -x509 -nodes -days 7300 -key server5.key -outform DER -out $@ -config authorityKeyId_subjectKeyId.conf -extensions 'v3_req'
+
+authorityKeyId_no_keyid.crt.der:
+	$(OPENSSL) req -x509 -nodes -days 7300 -key server5.key -outform DER -out $@ -config authorityKeyId_subjectKeyId.conf -extensions 'v3_req_authorityKeyId_no_keyid'
+
+authorityKeyId_no_issuer_serial.crt.der:
+	$(OPENSSL) req -x509 -nodes -days 7300 -key server5.key -outform DER -out $@ -config authorityKeyId_subjectKeyId.conf -extensions 'v3_req_authorityKeyId_no_issuer_serial'
+
+authorityKeyId_empty.crt.der:
+	$(OPENSSL) req -x509 -nodes -days 7300 -key server5.key -outform DER -out $@ -config authorityKeyId_subjectKeyId.conf -extensions 'v3_req_authorityKeyId_empty'
 
 authorityKeyId_subjectKeyId_tag_malformed.crt.der: authorityKeyId_subjectKeyId.crt.der
 	hexdump -ve '1/1 "%.2X"' $< | sed "s/04145061A58FD407D9D782010CE5657F8C6346A713BE/01145061A58FD407D9D782010CE5657F8C6346A713BE/" | xxd -r -p > $@
diff --git a/tests/data_files/authorityKeyId_empty.crt.der b/tests/data_files/authorityKeyId_empty.crt.der
new file mode 100644
index 0000000000000000000000000000000000000000..8ddf78d9fc07b3ae28095a3d3b669b788bbb3051
GIT binary patch
literal 412
zcmXqLVw_>n#Av^OnTe5!Nkr7#?ea!Lk<W7*3YJV`iVYOo7If2qi;Y98&EuRc3p0~}
zwIR0wCmVAp3!5;LpO2xS0Y8Yt&BGCppOaV=9PDE#X&?>~V&)Nm2`Pl67MCbEI~vG|
z^BNf&m>60Zm>HNGm_~{7nt-^*P%dSLM;ZvTv4h>o#0YgTGb1~*69bF+nXsE>oN`e`
zcE=-i|10FZtNF<`vE;&9k*(h|lp>QR`8{R0p)C0SmHs7@*jTZ>T^)zA%Xvf3c4_hb
zVmz_s?f=D!2J!~7Ku^i?v52vV1SBr)zrud=dJ`kh)71K&WVhwQ`;fzk*`2|_g-Jnw
z;rHit8<{tYT=_D`Uck0^i^)cfH-Bve722O|S<v-kC6j_s(V;iuug!WyH*6PSF<!{`
VdF$d$0{UOphnLkh`;{o_0RW<6e?kBN

literal 0
HcmV?d00001

diff --git a/tests/data_files/authorityKeyId_no_issuer_serial.crt.der b/tests/data_files/authorityKeyId_no_issuer_serial.crt.der
new file mode 100644
index 0000000000000000000000000000000000000000..3d587db7eb43ab7819d87da4ad97d11226534789
GIT binary patch
literal 412
zcmXqLVw_>n#Av^OnTe5!NyPh#^gRF2)xA>%eYZ=0IIi{SrbLGU7aNCGo5wj@7G@>`
zYeQ}WPB!LH7B*ofKOaLu1AY*Pn};JHKPRy$IM~Nf(m)&}#LOcA6H*9CEiO@Tb~KO^
z=QT1mFfp_+Ff%YSHHs4FH34yrp<K!gk2DZwV+XsFi4p2xW=3{qCk7VtGhsK&IOU>>
z?2bq3{#VF*SM!r?V#$TIB3r*_C`Bes@_Wi~Ls{_uEB#9*v9V%%yE+bKm-B|6?b71=
z#du=N+y9Fd4de}Efu54(V-aH!2}oSpe}(<#^(IE1r>XTl$!^Pq_aTQ7vpa)<3zI_N
z_x%S~aA@;~Ig0OGu;I63%r6c@=YOgG=j@H_45V+lF)0|AezZFIF8ZkU+z<bKvK#8U
U)^0A-jG9}Q8**mqUWbJj0p>S=%>V!Z

literal 0
HcmV?d00001

diff --git a/tests/data_files/authorityKeyId_no_keyid.crt.der b/tests/data_files/authorityKeyId_no_keyid.crt.der
new file mode 100644
index 0000000000000000000000000000000000000000..952f7b026900cd4caf0a1b168705bf6f96625885
GIT binary patch
literal 512
zcmXqLV*F#!#JG3?GZP~dlStqJMmN>jvCAIHo!d}xWx}FqyC1$a;9}#@YV$Z}%fifL
zU~R~4z{$oO%EBhh<mY23XuuERaPx2k<mV(71qb^WN*aiRgqV2*U_uHZsl_D<&W;9h
z;=D%21}26U24)6kMy65Xye1&7F_cT0;gJTyZ0ulnGBH9O%*@En?8LxgekSZ@8K+!S
zk=^k~-Tw-C?`nRsO)R;vR%Gk<45i4VNq$cmZYT@>f2DuPBsNxTZ&$~m>~h}Fvt3$z
zzZg$!dHa8HV~as!qk$~YTe5sCVk{y7iA(#hu;0Ai#K`kBwZ13WZMpD1g9MPYGE1aE
z_(J<7wiNlLiC{c1yE7QLFezxv5{llCwMFROk7qXFKep@=^6{H>|FDF6@D=VV^<AM~
om=wgbC+%ns4ZNGabpnsbv&X;Qcb)h8k)^->f_UfAsyCgx0LE6L^#A|>

literal 0
HcmV?d00001

diff --git a/tests/data_files/authorityKeyId_subjectKeyId.conf b/tests/data_files/authorityKeyId_subjectKeyId.conf
index 208082d20..7237724c1 100644
--- a/tests/data_files/authorityKeyId_subjectKeyId.conf
+++ b/tests/data_files/authorityKeyId_subjectKeyId.conf
@@ -9,3 +9,10 @@ commonName = PolarSSL Test CA
 [v3_req]
 subjectKeyIdentifier = hash
 authorityKeyIdentifier = keyid:always,issuer:always
+[v3_req_authorityKeyId_no_keyid]
+subjectKeyIdentifier = hash
+authorityKeyIdentifier = issuer:always
+[v3_req_authorityKeyId_no_issuer_serial]
+subjectKeyIdentifier = hash
+[v3_req_authorityKeyId_empty]
+subjectKeyIdentifier = hash
diff --git a/tests/suites/test_suite_x509parse.data b/tests/suites/test_suite_x509parse.data
index d73476a88..a46e47d7b 100644
--- a/tests/suites/test_suite_x509parse.data
+++ b/tests/suites/test_suite_x509parse.data
@@ -3313,6 +3313,18 @@ X509 CRT parse Authority Key Id - Correct Authority Key ID
 depends_on:MBEDTLS_MD_CAN_SHA1:MBEDTLS_RSA_C
 x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_subjectKeyId.crt.der":"5061A58FD407D9D782010CE5657F8C6346A713BE":"NL/PolarSSL/PolarSSL Test CA/":"3960EFDE5674DE1F7B761699CF8E5C024E209452":0
 
+X509 CRT parse Authority Key Id - Correct Authority Key ID (no keyid)
+depends_on:MBEDTLS_MD_CAN_SHA1:MBEDTLS_RSA_C
+x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_no_keyid.crt.der":"":"NL/PolarSSL/PolarSSL Test CA/":"51C00146259B5DA6E11ECEB078D490A296BBE1ED":0
+
+X509 CRT parse Authority Key Id - Correct Authority Key ID (no issuer and serial)
+depends_on:MBEDTLS_MD_CAN_SHA1:MBEDTLS_RSA_C
+x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_no_issuer_serial.crt.der":"5061A58FD407D9D782010CE5657F8C6346A713BE":"":"":0
+
+X509 CRT parse Authority Key Id - Correct Authority Key ID (empty)
+depends_on:MBEDTLS_MD_CAN_SHA1:MBEDTLS_RSA_C
+x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_empty.crt.der":"":"":"":0
+
 X509 CRT parse Authority Key Id - Wrong Length
 depends_on:MBEDTLS_MD_CAN_SHA1:MBEDTLS_RSA_C
 x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_subjectKeyId_length_malformed.crt.der":"":"":"":MBEDTLS_ERR_X509_INVALID_EXTENSIONS+MBEDTLS_ERR_ASN1_LENGTH_MISMATCH
diff --git a/tests/suites/test_suite_x509parse.function b/tests/suites/test_suite_x509parse.function
index 89155e958..71ab32cbd 100644
--- a/tests/suites/test_suite_x509parse.function
+++ b/tests/suites/test_suite_x509parse.function
@@ -1595,34 +1595,43 @@ void x509_crt_parse_authoritykeyid(char *file,
 
     if (ref_ret == 0) {
         /* KeyId test */
-        TEST_ASSERT(crt.authority_key_id.keyIdentifier.tag == MBEDTLS_ASN1_OCTET_STRING);
-        TEST_ASSERT(memcmp(crt.authority_key_id.keyIdentifier.p, keyId->x, keyId->len) == 0);
-        TEST_ASSERT(crt.authority_key_id.keyIdentifier.len == keyId->len);
+        if (crt.authority_key_id.keyIdentifier.len > 0)
+        {
+            TEST_ASSERT(crt.authority_key_id.keyIdentifier.tag == MBEDTLS_ASN1_OCTET_STRING);
+            TEST_ASSERT(memcmp(crt.authority_key_id.keyIdentifier.p, keyId->x, keyId->len) == 0);
+            TEST_ASSERT(crt.authority_key_id.keyIdentifier.len == keyId->len);
+        }
 
         /* Issuer test */
-        mbedtls_x509_sequence *issuerPtr = &crt.authority_key_id.authorityCertIssuer;
+        if (crt.authority_key_id.authorityCertIssuer.buf.len > 0)
+        {
+            mbedtls_x509_sequence *issuerPtr = &crt.authority_key_id.authorityCertIssuer;
 
-        TEST_ASSERT(mbedtls_x509_parse_subject_alt_name(&issuerPtr->buf, &san) == 0);
+            TEST_ASSERT(mbedtls_x509_parse_subject_alt_name(&issuerPtr->buf, &san) == 0);
 
-        pname = &san.san.directory_name;
+            pname = &san.san.directory_name;
 
-        while (pname != NULL) {
-            for (issuerCounter = 0; issuerCounter < pname->val.len; issuerCounter++) {
-                result |=
-                    (authorityKeyId_issuer[bufferCounter++] != pname->val.p[issuerCounter]);
+            while (pname != NULL) {
+                for (issuerCounter = 0; issuerCounter < pname->val.len; issuerCounter++) {
+                    result |=
+                        (authorityKeyId_issuer[bufferCounter++] != pname->val.p[issuerCounter]);
+                }
+                bufferCounter++; /* Skipping the slash */
+                pname = pname->next;
             }
-            bufferCounter++; /* Skipping the slash */
-            pname = pname->next;
+            mbedtls_x509_free_subject_alt_name(&san);
+            TEST_ASSERT(result == 0);
         }
-        mbedtls_x509_free_subject_alt_name(&san);
-        TEST_ASSERT(result == 0);
 
         /* Serial test */
-        TEST_ASSERT(crt.authority_key_id.authorityCertSerialNumber.tag ==
-                    MBEDTLS_ASN1_INTEGER);
-        TEST_ASSERT(memcmp(crt.authority_key_id.authorityCertSerialNumber.p,
-                           serial->x, serial->len) == 0);
-        TEST_ASSERT(crt.authority_key_id.authorityCertSerialNumber.len == serial->len);
+        if (crt.authority_key_id.authorityCertSerialNumber.len > 0)
+        {
+            TEST_ASSERT(crt.authority_key_id.authorityCertSerialNumber.tag ==
+                        MBEDTLS_ASN1_INTEGER);
+            TEST_ASSERT(memcmp(crt.authority_key_id.authorityCertSerialNumber.p,
+                            serial->x, serial->len) == 0);
+            TEST_ASSERT(crt.authority_key_id.authorityCertSerialNumber.len == serial->len);
+        }
 
     } else {
         TEST_ASSERT(crt.authority_key_id.keyIdentifier.tag == 0);

From a6a0a7929a207e7ac841e274af350fd4196eaa57 Mon Sep 17 00:00:00 2001
From: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
Date: Mon, 24 Apr 2023 10:18:52 +0200
Subject: [PATCH 05/14] Use TEST_EQUAL instead of TEST_ASSERT in tests

Signed-off-by: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
---
 tests/suites/test_suite_x509parse.function | 40 +++++++++++-----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/tests/suites/test_suite_x509parse.function b/tests/suites/test_suite_x509parse.function
index 71ab32cbd..b557858f9 100644
--- a/tests/suites/test_suite_x509parse.function
+++ b/tests/suites/test_suite_x509parse.function
@@ -1557,15 +1557,15 @@ void x509_crt_parse_subjectkeyid(char *file, data_t *subjectKeyId, int ref_ret)
 
     mbedtls_x509_crt_init(&crt);
 
-    TEST_ASSERT(mbedtls_x509_crt_parse_file(&crt, file) == ref_ret);
+    TEST_EQUAL(mbedtls_x509_crt_parse_file(&crt, file), ref_ret);
 
     if (ref_ret == 0) {
-        TEST_ASSERT(crt.subject_key_id.tag == MBEDTLS_ASN1_OCTET_STRING);
-        TEST_ASSERT(memcmp(crt.subject_key_id.p, subjectKeyId->x, subjectKeyId->len) == 0);
-        TEST_ASSERT(crt.subject_key_id.len == subjectKeyId->len);
+        TEST_EQUAL(crt.subject_key_id.tag, MBEDTLS_ASN1_OCTET_STRING);
+        TEST_EQUAL(memcmp(crt.subject_key_id.p, subjectKeyId->x, subjectKeyId->len), 0);
+        TEST_EQUAL(crt.subject_key_id.len, subjectKeyId->len);
     } else {
-        TEST_ASSERT(crt.subject_key_id.tag == 0);
-        TEST_ASSERT(crt.subject_key_id.len == 0);
+        TEST_EQUAL(crt.subject_key_id.tag, 0);
+        TEST_EQUAL(crt.subject_key_id.len, 0);
     }
 
 exit:
@@ -1591,15 +1591,15 @@ void x509_crt_parse_authoritykeyid(char *file,
 
     mbedtls_x509_crt_init(&crt);
 
-    TEST_ASSERT(mbedtls_x509_crt_parse_file(&crt, file) == ref_ret);
+    TEST_EQUAL(mbedtls_x509_crt_parse_file(&crt, file), ref_ret);
 
     if (ref_ret == 0) {
         /* KeyId test */
         if (crt.authority_key_id.keyIdentifier.len > 0)
         {
-            TEST_ASSERT(crt.authority_key_id.keyIdentifier.tag == MBEDTLS_ASN1_OCTET_STRING);
-            TEST_ASSERT(memcmp(crt.authority_key_id.keyIdentifier.p, keyId->x, keyId->len) == 0);
-            TEST_ASSERT(crt.authority_key_id.keyIdentifier.len == keyId->len);
+            TEST_EQUAL(crt.authority_key_id.keyIdentifier.tag, MBEDTLS_ASN1_OCTET_STRING);
+            TEST_EQUAL(memcmp(crt.authority_key_id.keyIdentifier.p, keyId->x, keyId->len), 0);
+            TEST_EQUAL(crt.authority_key_id.keyIdentifier.len, keyId->len);
         }
 
         /* Issuer test */
@@ -1607,7 +1607,7 @@ void x509_crt_parse_authoritykeyid(char *file,
         {
             mbedtls_x509_sequence *issuerPtr = &crt.authority_key_id.authorityCertIssuer;
 
-            TEST_ASSERT(mbedtls_x509_parse_subject_alt_name(&issuerPtr->buf, &san) == 0);
+            TEST_EQUAL(mbedtls_x509_parse_subject_alt_name(&issuerPtr->buf, &san), 0);
 
             pname = &san.san.directory_name;
 
@@ -1620,25 +1620,25 @@ void x509_crt_parse_authoritykeyid(char *file,
                 pname = pname->next;
             }
             mbedtls_x509_free_subject_alt_name(&san);
-            TEST_ASSERT(result == 0);
+            TEST_EQUAL(result, 0);
         }
 
         /* Serial test */
         if (crt.authority_key_id.authorityCertSerialNumber.len > 0)
         {
-            TEST_ASSERT(crt.authority_key_id.authorityCertSerialNumber.tag ==
+            TEST_EQUAL(crt.authority_key_id.authorityCertSerialNumber.tag,
                         MBEDTLS_ASN1_INTEGER);
-            TEST_ASSERT(memcmp(crt.authority_key_id.authorityCertSerialNumber.p,
-                            serial->x, serial->len) == 0);
-            TEST_ASSERT(crt.authority_key_id.authorityCertSerialNumber.len == serial->len);
+            TEST_EQUAL(memcmp(crt.authority_key_id.authorityCertSerialNumber.p,
+                            serial->x, serial->len), 0);
+            TEST_EQUAL(crt.authority_key_id.authorityCertSerialNumber.len, serial->len);
         }
 
     } else {
-        TEST_ASSERT(crt.authority_key_id.keyIdentifier.tag == 0);
-        TEST_ASSERT(crt.authority_key_id.keyIdentifier.len == 0);
+        TEST_EQUAL(crt.authority_key_id.keyIdentifier.tag, 0);
+        TEST_EQUAL(crt.authority_key_id.keyIdentifier.len, 0);
 
-        TEST_ASSERT(crt.authority_key_id.authorityCertSerialNumber.tag == 0);
-        TEST_ASSERT(crt.authority_key_id.authorityCertSerialNumber.len == 0);
+        TEST_EQUAL(crt.authority_key_id.authorityCertSerialNumber.tag, 0);
+        TEST_EQUAL(crt.authority_key_id.authorityCertSerialNumber.len, 0);
     }
 
 exit:

From b1f0b536d7cbde529995fa924ce19aad3167b4f8 Mon Sep 17 00:00:00 2001
From: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
Date: Fri, 5 May 2023 16:07:10 +0200
Subject: [PATCH 06/14] Add test for invalid KeyIdentifier tag length + adapt
 error code

Signed-off-by: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
---
 tests/data_files/Makefile                         |   3 +++
 ...d_subjectKeyId_keyid_tag_len_malformed.crt.der | Bin 0 -> 536 bytes
 tests/suites/test_suite_x509parse.data            |   4 ++--
 3 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 tests/data_files/authorityKeyId_subjectKeyId_keyid_tag_len_malformed.crt.der

diff --git a/tests/data_files/Makefile b/tests/data_files/Makefile
index 461ad8bc9..3b23ec6f1 100644
--- a/tests/data_files/Makefile
+++ b/tests/data_files/Makefile
@@ -574,6 +574,9 @@ authorityKeyId_subjectKeyId_sequence_tag_malformed.crt.der: authorityKeyId_subje
 authorityKeyId_subjectKeyId_keyid_tag_malformed.crt.der: authorityKeyId_subjectKeyId.crt.der
 	hexdump -ve '1/1 "%.2X"' $< | sed "s/306D80145061A58FD407/306D00145061A58FD407/" | xxd -r -p > $@
 
+authorityKeyId_subjectKeyId_keyid_tag_len_malformed.crt.der: authorityKeyId_subjectKeyId.crt.der
+	hexdump -ve '1/1 "%.2X"' $< | sed "s/306D80145061A58FD407/306D80FF5061A58FD407/" | xxd -r -p > $@
+
 authorityKeyId_subjectKeyId_issuer_tag1_malformed.crt.der: authorityKeyId_subjectKeyId.crt.der
 	hexdump -ve '1/1 "%.2X"' $< | sed "s/A13FA43D303B310B3009/003FA43D303B310B3009/" | xxd -r -p > $@
 
diff --git a/tests/data_files/authorityKeyId_subjectKeyId_keyid_tag_len_malformed.crt.der b/tests/data_files/authorityKeyId_subjectKeyId_keyid_tag_len_malformed.crt.der
new file mode 100644
index 0000000000000000000000000000000000000000..1e290420df659e8f272a2ef8533db5d49532a582
GIT binary patch
literal 536
zcmXqLViGZEV%)ianTe5!NyIYY{k^b~d-By~Vl&V8#W49PObIgJV&l+i^EhYA!pvk~
zZOCoF$;KSY!Y0h*=VK^nzz^bZ^Kb;@=Oh*d2m2UG8i<30n0W+XLJA?N#U%>Pjs|k#
zyhg?bCI)5(=7ts~hEd|YCLpdMluMc6kp{wS>|l2?F+v^8%*f8{#K2;HChTSzr(9H#
z-SJ4>{|b5UYJRd!EV-~&Wb5|~rO2d7eoq;0C=337rGLpJHdbtJSI433a^BFhU0Qs<
z7*A|@`+srcEQ7}B2C_hJ$?~y?v4{jDF73a<e)D=0BhS;+`krLB<-+?6%0SY}Ecphx
z4gawzSZKe*mLeZE5sV#XPX+@wCPjw+No~1zo-10t_-rX2dDttrSdQ^{|E%m+=1H5r
t`&52Y2P(NRx$mIjvu{gwOgQpWV8y-fuha5A3*A~UOMCsE4`-N_>jC~ys>J{R

literal 0
HcmV?d00001

diff --git a/tests/suites/test_suite_x509parse.data b/tests/suites/test_suite_x509parse.data
index a46e47d7b..6c7270bf5 100644
--- a/tests/suites/test_suite_x509parse.data
+++ b/tests/suites/test_suite_x509parse.data
@@ -3338,8 +3338,8 @@ depends_on:MBEDTLS_MD_CAN_SHA1:MBEDTLS_RSA_C
 x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_subjectKeyId_keyid_tag_malformed.crt.der":"":"":"":MBEDTLS_ERR_X509_INVALID_EXTENSIONS+MBEDTLS_ERR_ASN1_UNEXPECTED_TAG
 
 X509 CRT parse Authority Key Id - Wrong KeyId Tag Length
-depends_on:MBEDTLS_MD_CAN_SHA256:MBEDTLS_RSA_C
-x509_crt_parse_authoritykeyid:"3082039F30820287A00302010202142121EA5121F25E38DF2697F6851A9B43490DE495300D06092A864886F70D01010B0500303B310B3009060355040613024E4C3111300F060355040B0C08506F6C617253534C3119301706035504030C10506F6C617253534C2054657374204341301E170D3233303530363138333231315A170D3433303530313138333231315A303B310B3009060355040613024E4C3111300F060355040B0C08506F6C617253534C3119301706035504030C10506F6C617253534C205465737420434130820122300D06092A864886F70D01010105000382010F003082010A0282010100C14DA3DDE7CD1DD104D74972B899AC0E78E43A3C4ACF3A1316D05AE4CDA30088A7EE1E6B96A752B490EF2D727A3E249AFCB634AC24F577E026648C9CB0287DA1DAEA8CE6C91C96BCFEC10452B336D4A3FAE1B176D890C161B4665236A22653AAAB745E077D1982DB2AD81FA0D90D1C2D4966F75B257346E80B8A4F690CB50090E1DA8210667DAE542B8B657991A1E261C3CD404908EE680CF18B86D246BFD0B8AA11031E7F56A81A1E44180F0F858BDA8B445EE218C6622FC7668DFA5DD87DF327892901C5900E3F27F130C84A0EEFD6DEC7C7276BC7053D7AC4023C9A1D3E0FE834985BCB734B5296D811A22C808869395AD30FB0DE592F11C7F7EA120130970203010001A3819A308197301D0603551D0E04160414A505E864B8DCDF600F50124D60A864AF4D8B439330760603551D23046F306D80FFA505E864B8DCDF600F50124D60A864AF4D8B4393A13FA43D303B310B3009060355040613024E4C3111300F060355040B0C08506F6C617253534C3119301706035504030C10506F6C617253534C205465737420434182142121EA5121F25E38DF2697F6851A9B43490DE495300D06092A864886F70D01010B05000382010100409122DCB6D31ABA0B65F2DD7A590F30E43864F9293B889223BF320177D24B50EE202D5A88406BE68D2BD0047B72016376F64D0420BE1D639159E9B54666587434966364EF855B37155D5891C68A02D90E44206F27C7D78DE2E3BF5373521F8BBA8390151814004D099D2B46080A9E0C467B1E0D8B93BAC1E1B3AE4FD20FD83E285BA7168DC81D80B468AEB21D645490F0B87A65DDE17DAD1AF46EDF9126565592291FE159434A9D93DFFFA65F658C6DBCD02D56E591CD4B9390878288B890497E56998C845D3ED4145DAAD6A16556C2FDEAE780BE297531842B2A565824BD85128D4E459B0F370DBEC9E190FABA7D88C1514B3B6935F421B4FBC393D733A785":0:"":0:MBEDTLS_ERR_X509_INVALID_EXTENSIONS+MBEDTLS_ERR_ASN1_INVALID_LENGTH
+depends_on:MBEDTLS_MD_CAN_SHA1:MBEDTLS_RSA_C
+x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_subjectKeyId_keyid_tag_len_malformed.crt.der":"":"":"":MBEDTLS_ERR_X509_INVALID_EXTENSIONS+MBEDTLS_ERR_ASN1_INVALID_LENGTH
 
 X509 CRT parse Authority Key Id - Wrong Issuer Tag 1
 depends_on:MBEDTLS_MD_CAN_SHA1:MBEDTLS_RSA_C

From 2c64e90e027a15e4c04ef21d65d287515cc1ee32 Mon Sep 17 00:00:00 2001
From: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
Date: Sat, 6 May 2023 20:55:56 +0200
Subject: [PATCH 07/14] Use RSA keys in generated certificates

Signed-off-by: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
---
 tests/data_files/Makefile                     |  18 +++++-----
 tests/data_files/authorityKeyId_empty.crt.der | Bin 412 -> 809 bytes
 .../authorityKeyId_no_issuer_serial.crt.der   | Bin 412 -> 809 bytes
 .../authorityKeyId_no_keyid.crt.der           | Bin 512 -> 909 bytes
 .../authorityKeyId_subjectKeyId.crt.der       | Bin 536 -> 931 bytes
 ...subjectKeyId_issuer_tag1_malformed.crt.der | Bin 536 -> 931 bytes
 ...subjectKeyId_issuer_tag2_malformed.crt.der | Bin 536 -> 931 bytes
 ...bjectKeyId_keyid_tag_len_malformed.crt.der | Bin 536 -> 931 bytes
 ...d_subjectKeyId_keyid_tag_malformed.crt.der | Bin 536 -> 931 bytes
 ...eyId_subjectKeyId_length_malformed.crt.der | Bin 536 -> 931 bytes
 ...ubjectKeyId_sequence_tag_malformed.crt.der | Bin 536 -> 931 bytes
 ...tyKeyId_subjectKeyId_tag_malformed.crt.der | Bin 536 -> 931 bytes
 tests/suites/test_suite_x509parse.data        |  34 +++++++++---------
 13 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/tests/data_files/Makefile b/tests/data_files/Makefile
index 3b23ec6f1..30c65ff54 100644
--- a/tests/data_files/Makefile
+++ b/tests/data_files/Makefile
@@ -551,31 +551,31 @@ crl_cat_rsa-ec.pem:crl.pem crl-ec-sha256.pem
 all_final += crl_cat_ec-rsa.pem crl_cat_rsa-ec.pem
 
 authorityKeyId_subjectKeyId.crt.der:
-	$(OPENSSL) req -x509 -nodes -days 7300 -key server5.key -outform DER -out $@ -config authorityKeyId_subjectKeyId.conf -extensions 'v3_req'
+	$(OPENSSL) req -x509 -nodes -days 7300 -key server2.key -outform DER -out $@ -config authorityKeyId_subjectKeyId.conf -extensions 'v3_req'
 
 authorityKeyId_no_keyid.crt.der:
-	$(OPENSSL) req -x509 -nodes -days 7300 -key server5.key -outform DER -out $@ -config authorityKeyId_subjectKeyId.conf -extensions 'v3_req_authorityKeyId_no_keyid'
+	$(OPENSSL) req -x509 -nodes -days 7300 -key server2.key -outform DER -out $@ -config authorityKeyId_subjectKeyId.conf -extensions 'v3_req_authorityKeyId_no_keyid'
 
 authorityKeyId_no_issuer_serial.crt.der:
-	$(OPENSSL) req -x509 -nodes -days 7300 -key server5.key -outform DER -out $@ -config authorityKeyId_subjectKeyId.conf -extensions 'v3_req_authorityKeyId_no_issuer_serial'
+	$(OPENSSL) req -x509 -nodes -days 7300 -key server2.key -outform DER -out $@ -config authorityKeyId_subjectKeyId.conf -extensions 'v3_req_authorityKeyId_no_issuer_serial'
 
 authorityKeyId_empty.crt.der:
-	$(OPENSSL) req -x509 -nodes -days 7300 -key server5.key -outform DER -out $@ -config authorityKeyId_subjectKeyId.conf -extensions 'v3_req_authorityKeyId_empty'
+	$(OPENSSL) req -x509 -nodes -days 7300 -key server2.key -outform DER -out $@ -config authorityKeyId_subjectKeyId.conf -extensions 'v3_req_authorityKeyId_empty'
 
 authorityKeyId_subjectKeyId_tag_malformed.crt.der: authorityKeyId_subjectKeyId.crt.der
-	hexdump -ve '1/1 "%.2X"' $< | sed "s/04145061A58FD407D9D782010CE5657F8C6346A713BE/01145061A58FD407D9D782010CE5657F8C6346A713BE/" | xxd -r -p > $@
+	hexdump -ve '1/1 "%.2X"' $< | sed "s/0414A505E864B8DCDF600F50124D60A864AF4D8B4393/0114A505E864B8DCDF600F50124D60A864AF4D8B4393/" | xxd -r -p > $@
 
 authorityKeyId_subjectKeyId_length_malformed.crt.der: authorityKeyId_subjectKeyId.crt.der
-	hexdump -ve '1/1 "%.2X"' $< | sed "s/306D80145061A58FD407/306C80145061A58FD407/" | xxd -r -p > $@
+	hexdump -ve '1/1 "%.2X"' $< | sed "s/306D8014A505E864B8DC/306C8014A505E864B8DC/" | xxd -r -p > $@
 
 authorityKeyId_subjectKeyId_sequence_tag_malformed.crt.der: authorityKeyId_subjectKeyId.crt.der
-	hexdump -ve '1/1 "%.2X"' $< | sed "s/6F306D80145061A58FD4/6F006D80145061A58FD4/" | xxd -r -p > $@
+	hexdump -ve '1/1 "%.2X"' $< | sed "s/6F306D8014A505E864B8/6F006D8014A505E864B8/" | xxd -r -p > $@
 
 authorityKeyId_subjectKeyId_keyid_tag_malformed.crt.der: authorityKeyId_subjectKeyId.crt.der
-	hexdump -ve '1/1 "%.2X"' $< | sed "s/306D80145061A58FD407/306D00145061A58FD407/" | xxd -r -p > $@
+	hexdump -ve '1/1 "%.2X"' $< | sed "s/306D8014A505E864B8DC/306D0014A505E864B8DC/" | xxd -r -p > $@
 
 authorityKeyId_subjectKeyId_keyid_tag_len_malformed.crt.der: authorityKeyId_subjectKeyId.crt.der
-	hexdump -ve '1/1 "%.2X"' $< | sed "s/306D80145061A58FD407/306D80FF5061A58FD407/" | xxd -r -p > $@
+	hexdump -ve '1/1 "%.2X"' $< | sed "s/306D8014A505E864B8DC/306D80FFA505E864B8DC/" | xxd -r -p > $@
 
 authorityKeyId_subjectKeyId_issuer_tag1_malformed.crt.der: authorityKeyId_subjectKeyId.crt.der
 	hexdump -ve '1/1 "%.2X"' $< | sed "s/A13FA43D303B310B3009/003FA43D303B310B3009/" | xxd -r -p > $@
diff --git a/tests/data_files/authorityKeyId_empty.crt.der b/tests/data_files/authorityKeyId_empty.crt.der
index 8ddf78d9fc07b3ae28095a3d3b669b788bbb3051..e4a208661045ff15c87f970685a73490c6419f8a 100644
GIT binary patch
delta 696
zcmV;p0!RIv1E~fwFoFXmFoFUNpaTK{0s<5l%YrLKras6<^{K>;?{=c<l3!Rb4F(A+
zhDe6@4FLfQ1ptvRL>V<OI59CXHZU?;7Y#HsFf}kUF)=YVFfv+^FFt>Q0U|IB1_>&L
zNQU<f0RaI800V*n4*)QN0SW?w0RaHPO{3lC%^lGM*GY1?nXC?Y<T^Y`&pHzp&|2ip
zqX3Af?jCEFr&6?#?=5nAJ|vp_wlu6H^>^SVWQ?4!D1D*Y>Wt>e9G1NP!30vXHq@i~
z;jwnukilWJW>PkyCR2Z^t8`umeHnt=D%c;O*$o^mNoMz3C38mT3yM!^47C7|;o5=_
zW__+yD~n}$k)h&Y!_7cR2<~VM@r#DiM!(Rwsu2Soe^#g(9z+-q4~2``i$q@H7{+2R
z$7YTCUD$o|Cy6Nm#gGm^C-E@IN)GSV-p9u$YsUpWdc*=enjL>W59l<QTg!7xQkK{e
zqAY-jX*pWc53t@@FA>N0>JkAkmjVL;00E;RFdr}-1_M<c4g?ki6r}~|WVqblU=L6d
zO<<^GuT6_XlQ0bi2`Yw2hW8Bt0Sg5H1A+ko00492AO~kPOs*?ttFCOBU%qJD=j!b2
zbfurAH3Qy+fYg6oqkk&QMdk}ZjNFh1;6=SXzDN9d^M-qN0|6<24Ez}|f;5~C_?N(M
zO47v0;+4#XGyUs!tYjZ3@8*|oe64n%V~^`TW(@FBXi;E%7{tpb17du`*O5ZfNF8jj
z*-|iRZmE7;ck-?80)e4Z%k3~WJWPSs<`MaK??M-0ZT4XQuOKDc%>xe0ym}s|B!R+|
zKv>^Kp<hRq(G!iv*FkX^0bl?>-0V?CLTcctCp%%?rm<6eQodIGk?$J#Rfov&vu}Nm
e>XO$-HpGU_^t*U7$Xr#g+OLD<vzxmxp$pwttuBuM

delta 298
zcmZ3<Hiuc?powt?5Zf<cW@2Pw5)n0byS&j*<n!Eyf+f?KVgtpt1>H2@V&l+i^EhYA
z!pt<W-)>?7n}ms>g@KuYxq)evIIoGZfr+6pggdd%zCO}Gn2jB*o{15vk(rU5*@=P0
z{7l%*GETXuBD>>}y8jjO-qrkMn^<yTt;p8z8A_2!ll-1C+)x($|4RRoNo=gx-mZ>A
z+2y>UXS=lcelecd^7j8?MFV*QSvKZSSw0pq7LkC&rTtgfZ(eU=<awG}-;?aNTzH=W
zS1`h{%<c>ZE=&sg3%@_F+sM3G<jR*h_5!xWTTC`;y!mS*sL=jw%Yv>SE1498iVnRI
he{I$yx?#Hri}6Cf&s!I7643v$KD?~9*{?)V4*&<!Ydrt}

diff --git a/tests/data_files/authorityKeyId_no_issuer_serial.crt.der b/tests/data_files/authorityKeyId_no_issuer_serial.crt.der
index 3d587db7eb43ab7819d87da4ad97d11226534789..19c3c4976c5741ff36299dfb8c11797bc387ac43 100644
GIT binary patch
delta 696
zcmV;p0!RIv1E~fwFoFXmFoFUNpaTK{0s<69(0tq;_dE6a561M~)9~6mr-uJ94F(A+
zhDe6@4FLfQ1ptvRL>V<OI59CXHZU?;7Y#HsFf}kUF)=YVFfv+^FFt>Q0U|IB1_>&L
zNQU<f0RaI800V*n4*)QN0SW?w0RaHPO{3lC%^lGM*GY1?nXC?Y<T^Y`&pHzp&|2ip
zqX3Af?jCEFr&6?#?=5nAJ|vp_wlu6H^>^SVWQ?4!D1D*Y>Wt>e9G1NP!30vXHq@i~
z;jwnukilWJW>PkyCR2Z^t8`umeHnt=D%c;O*$o^mNoMz3C38mT3yM!^47C7|;o5=_
zW__+yD~n}$k)h&Y!_7cR2<~VM@r#DiM!(Rwsu2Soe^#g(9z+-q4~2``i$q@H7{+2R
z$7YTCUD$o|Cy6Nm#gGm^C-E@IN)GSV-p9u$YsUpWdc*=enjL>W59l<QTg!7xQkK{e
zqAY-jX*pWc53t@@FA>N0>JkAkmjVL;00E;RFdr}-1_M<c4g?ki6r}~|WVqblU=L6d
zO<<^GuT6_XlQ0bi2`Yw2hW8Bt0Sg5H1A+ko02#Mo)A%R0%s&5XMS286S{&Hl4Ynb4
zq;jGcLC9OpfBk=&8<x7Bpel>m%5bRjSY9^chbdKj_l(+1fIhVqCdIKlc@9x<ChoVY
z)1~a0IM5|0R$@}9iizHs)$*-C@(5N=B=@AVx*YW`q*%MgT%(Hu48IbghTPILTt0ai
zDP81lS{q@lU9dz9xwmM(?c>4&z^=TwnPzDr;Eq&+tmR-=7hIU*9%Dv*JDi#M%s{H)
ztlstZydOUDAh?$YUMZnUDGi`i!BB^d=hZuN+VR`9YB*%s5(CLFzIdj5cGz(smqFrf
eBF{>`*cD^0^<lZ)H#sVF9vmcIAuS4pi3-ZszAVuI

delta 297
zcmZ3<Hiuc?powt?5Zf<cW@2Pw67jwwJ<mUMb?;O`-|f;Lj%$6oDbZoT#m1r4=5fxJ
zg_&t$zum+FHgOX}3j;F)GgG4|ab6Q+0~14IFn40FLw%%yFdI8qITIsPA2TC6vl9c0
z`I)erWt?(RMRvy{b^j~my{q}jHnHTwT9K{aGn68eCiy*OxS=fg|CRnFlh|0Xy<HuL
zvdeix&vt3?{bD?^<?a8)iU#rqvTV$uvV1IJEFuAkOZ%^|-@M+$$n!L{z9-pjx$r&%
zu3&^)ncW!-T$mIBzwbY|f<v1>%u#&jf(^eNV}5ZMI{!=cKWA@bXCQscjY+|{^rO|u
hchN_+=YII_lig6)wRUrvX4Kre+>kR<_c|=R2mp;pY?S~2

diff --git a/tests/data_files/authorityKeyId_no_keyid.crt.der b/tests/data_files/authorityKeyId_no_keyid.crt.der
index 952f7b026900cd4caf0a1b168705bf6f96625885..c6d0d7e9869897115c705c46801b28c1334c581b 100644
GIT binary patch
delta 723
zcmZo*>18)EXkzX(Xksc{z|6$R#3WMM_~~NCKjWV%AJ)acX!&*dXuQfT170>xtu~Lg
z@4SqR+^h@}^<5-Q4J-@|4b2RUqQrSkj15c;jG^3#`gZkAj7rE_7+D#Zn;7{S44N3Z
zn3@<F84mg`zWe;F>_wLAo<%!muHmbAVrAoX-bz^PLe!J9iy1nWzmv<JwmfLdg!j5d
zRdy<~{%kW@qw=-<fm%w>oDCYa3va#Zd3I7}+Ma(0S%Nm3U0M9=;l{EX6AmVBNeePt
zq!wJiYIR8*d#z;CZLJ&f3vTkt=z6Aok5(;qd%@l1pUJb8VZy^(O#*4P>q4}<Q!6Jf
ze3W?jtb-@Vy9}O>-EEiL_FvesN|0HuK5T`QoQniMe{1)xZkM=6633GCkEiwiioH?$
zS-n$}@#q9Td-ab7C%pLHU%PkwxO(<+R@<s0Og6J*eeC#On9PViUF;n+?S|kYoraD~
z%c#rz8}3Ew3m*UeN{G>5IukP^1LNYx7K6q{16elaP+2|}F&2@ftS?e_+_|5?A0XtL
zup(u>Z@2U0$)1dU^+ZGpFoYQy1Wa?v*B<n#vl4Mslt|9YNPWIYYjs(>tB$dR$CLO&
z+C|~syI8*WpMQDDL*kHW$7<dp-OEqAu5R`*tlqX%>$dyW*tJtn{#|qI`N_H6<sAP~
zjISo`607j2*W9vFko#f%s#w;w%%_e{sNKZKm@(r>?!wv>Uxs!swH@z%b9DykNVpc-
z>Ti3&Z8$l-dGQlZzV4EU+h_T7_<CP;s$`#v=i4pveT8i7v7W0-rhGKmA=r?Tui>Yu
z%^G=Y^ZZ1cw_CP%%v{28t4ZvKc-&3*Hup*G%&Xlam-S7*aY1Y5U(Xr_cLlMwX(oEB
jny$*WA8k0_rF#CjW75N()s;(+E533`zfo5hx9=waf<`xD

delta 324
zcmeBWZ(z|kXkz>W#ETa&GchtTi3A>CbW@!jyX>LdxeXOpCM=q^`{7#yE;bIWHji_*
zEX+(3`|Tzcut}I0S{Rram>HQyiSwEm8<-dxL%0+B?CT>9gxT1^>X{g!8krf{nVlF|
z%+G|~EaQ}mDzZBssrz3c?_JGLwuvPd){1QXo}m<(G|BHN!wqG@|F85fnZ(A5?d|F~
zlwHmndbUf8?-%2VEpPuXZfr4VY&4K%V-A(&V-aH!2}oSpe}(<#^(IE1r>XTl$!^Pq
z_e~aO^2;RT4Q6)+0~aO*jafp`8?v?t-TU#(Cj7^iT|z#7v+f_3a1Xx1U8TM&^b3=M
mc=n_n&7pyJ)3;9G5qb9b*ZZ#XUO%$**Iy9tJX-apa~A+obAJ*5

diff --git a/tests/data_files/authorityKeyId_subjectKeyId.crt.der b/tests/data_files/authorityKeyId_subjectKeyId.crt.der
index dbbe51866b15d91efa225450b203d954d4d098d6..4186b499eddad9401a12564f52bda63193073a86 100644
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&v9WHk|!)_~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;bvTd&b

literal 536
zcmXqLViGZEV%)ianTe5!NyIYY{k^b~d-By~Vl&V8#W49PObIgJV&l+i^EhYA!pvk~
zZOCoF$;KSY!Y0h*=VK^nzz^bZ^Kb;@=Oh*d2m2UG8i<30n0W+XLJA?N#U%>Pjs|k#
zyhg?bCI)5(=7ts~hEd|YCLpdMluMc6kp{wS>|l2?F+v^8%*f8{#K2;HChTSzr(9H#
z-SJ4>{|b5UYJRd!EV-~&Wb5|~rO2d7eoq;0C=337rGLpJHdbtJSI433a^BFhU0Qs<
z7*A|@`+srcEQ7}B2C_hJ$?~y?v4{jDF73a<e)D=0BhS;+`krLB<-+?6%0SY}Ecphx
z4OkT{v|nONkq?^)#tyS5gMk~9B18YAw%j|<6|G);wiJ&%?3G(A$9TMdR`x6Nq)p#_
sD!-`%m0XzIcTn-!w<S9!9Qi4*;@<byX?dT8ZY`Lly?)P!GtA2M083A)+5i9m

diff --git a/tests/data_files/authorityKeyId_subjectKeyId_issuer_tag1_malformed.crt.der b/tests/data_files/authorityKeyId_subjectKeyId_issuer_tag1_malformed.crt.der
index 6f9ce685e75726d64f19385f625943d490913957..0e3f5789873353570e636875f70f84d9ce2ab11b 100644
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`3AWSSQRkXFR`U4vYLoVYryDZWSDxM@#~f+-)7ucCK>bU@rPTVl9_kCoOa9K
z=(5QsnP<Pm`gb<!>c6Zk`JbaTW&b<Rhbz^WvGV@f{ZaO^Cf}Y}Uy4I_-d*5osmnCO
z<LsmvHotn54vC(d!+Iz1ylmFS^z4OKZ~tHaaL<`1f0%p(+SlF+JiGkOrpP<#h6@jL
zr#*7BfBA-Q!J>+kpp{8-$*=D`d$H5jH#O5{`&3s&zDqVW(_j5r8Ssef@W;X}Cw4qs
zu=2FFUF)xP7f)`_5q!F?eVtX!E2)<)W(sdU<iv{H`R9~jT^RFrk?|^~#H=N8KFim|
q?2-%BZ<~9;MdV1EWyie9t1_lo{CT;kD>r3QRz&p?TQ@aVm0kb?XKfAu

literal 536
zcmXqLViGZEV%)ianTe5!NyIYY{k^b~d-By~Vl&V8#W49PObIgJV&l+i^EhYA!pvk~
zZOCoF$;KSY!Y0h*=VK^nzz^bZ^Kb;@=Oh*d2m2UG8i<30n0W+XLJA?N#U%>Pjs|k#
zyhg?bCI)5(=7ts~hEd|YCLpdMluMc6kp{wS>|l2?F+v^8%*f8{#K2;HChTSzr(9H#
z-SJ4>{|b5UYJRd!EV-~&Wb5|~rO2d7eoq;0C=337rGLpJHdbtJSI433a^BFhU0Qs<
z7*A|@`+srcEQ7}B2C_hJ$?~y?v4{jDF73a<e)D=0BhS;+`krLB<-+?6%0SY}Ecphx
z4OkU0*e|iA$cIe?V~5$3!N844k)eN5Tkf6bidHW^TZ%^>_R1}mV?5qJEBlps(x&e|
smEY8XN-j+9JE-{V+mam<j{Fo@aqs)<w7kzkw-(IOUccwV8D`~r0Nv85IRF3v

diff --git a/tests/data_files/authorityKeyId_subjectKeyId_issuer_tag2_malformed.crt.der b/tests/data_files/authorityKeyId_subjectKeyId_issuer_tag2_malformed.crt.der
index c96704338b6b706ac9632865bc0295fafe1c3231..1c8519b64a7e2f3aa486aed7eabf33b93a630cc1 100644
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^XRxIxvYLoVYryDZWSDxM@#~f+-)7ucCK>bU@rPTVl9_kCoOa9K
z=(5QsnP<Pm`gb<!>c6Zk`JbaTW&b<Rhbz^WvGV@f{ZaO^Cf}Y}Uy4I_-d*5osmnCO
z<LsmvHotn54vC(d!+Iz1ylmFS^z4OKZ~tHaaL<`1f0%p(+SlF+JiGkOrpP<#h6@jL
zr#*7BfBA-Q!J>+kpp{8-$*=D`d$H5jH#O5{`&3s&zDqVW(_j5r8Ssef@W;X}Cw4qs
zu=2FFUF)xP7f)`_5q!F?eVtX!E2)<)W(sdU<iv{H`R9~jT^RFrk?|^~#H=N8KFim|
q?2-%BZ<~9;MdV1EWyie9t1_lo{CT;kD>r3QRz&p?TQ@aVm0kb<Zfy$y

literal 536
zcmXqLViGZEV%)ianTe5!NyIYY{k^b~d-By~Vl&V8#W49PObIgJV&l+i^EhYA!pvk~
zZOCoF$;KSY!Y0h*=VK^nzz^bZ^Kb;@=Oh*d2m2UG8i<30n0W+XLJA?N#U%>Pjs|k#
zyhg?bCI)5(=7ts~hEd|YCLpdMluMc6kp{wS>|l2?F+v^8%*f8{#K2;HChTSzr(9H#
z-SJ4>{|b5UYJRd!EV-~&Wb5|~rO2d7eoq;0C=337rGLpJHdbtJSI433a^BFhU0Qs<
z7*A|@`+srcEQ7}B2C_hJ$?~y?v4{jDF73a<e)D=0BhS;+`krLB<-+?6%0SY}Ecphx
z4OkT{v}drT$cIe?V~5$3!N844k)eN5Tkf6bidHW^TZ%^>_R1}mV?5qJEBlps(x&e|
smEY8XN-j+9JE-{V+mam<j{Fo@aqs)<w7kzkw-(IOUccwV8D`~r0NoI&HUIzs

diff --git a/tests/data_files/authorityKeyId_subjectKeyId_keyid_tag_len_malformed.crt.der b/tests/data_files/authorityKeyId_subjectKeyId_keyid_tag_len_malformed.crt.der
index 1e290420df659e8f272a2ef8533db5d49532a582..469493ea0dcfb74dafeeb3f1ab4754fb12b568dc 100644
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`3AWS|FJ1pXurgkqR46@CanRZkC9>OdB(3>o_w2eW0_>ktH&R1eM)BD^>W%R
zf1}GLn`EB-66@dDsH^|7vgCh`)|CD4JRh!9U&hM&YxhUl%bI+9W_>9R-FbI`tEDc}
z43D#uX4w4dQ92}gZVv06!1J<M8`HBFUcLQ){lh(Hp8R3*5olj~EAZ^{H=82wq#G_g
z(4F?k&Hm*Zz6FaaQi4_{$tAzO^X$b=Ti?`7o9$Cw75OgN)J%W%XJx=6uEQS-x18AV
zaKXyc+IFqK)?GZgJxB2Ay7qNeHLs*zwwNir`H&MUa_65@hIL`g+eOB!m=d#=#Q7{=
r7qd$)RKIQR1s9PcZI&JLCa=nvV)5tYqORPONm&uqM{M2HTvd7jNKkH?

literal 536
zcmXqLViGZEV%)ianTe5!NyIYY{k^b~d-By~Vl&V8#W49PObIgJV&l+i^EhYA!pvk~
zZOCoF$;KSY!Y0h*=VK^nzz^bZ^Kb;@=Oh*d2m2UG8i<30n0W+XLJA?N#U%>Pjs|k#
zyhg?bCI)5(=7ts~hEd|YCLpdMluMc6kp{wS>|l2?F+v^8%*f8{#K2;HChTSzr(9H#
z-SJ4>{|b5UYJRd!EV-~&Wb5|~rO2d7eoq;0C=337rGLpJHdbtJSI433a^BFhU0Qs<
z7*A|@`+srcEQ7}B2C_hJ$?~y?v4{jDF73a<e)D=0BhS;+`krLB<-+?6%0SY}Ecphx
z4gawzSZKe*mLeZE5sV#XPX+@wCPjw+No~1zo-10t_-rX2dDttrSdQ^{|E%m+=1H5r
t`&52Y2P(NRx$mIjvu{gwOgQpWV8y-fuha5A3*A~UOMCsE4`-N_>jC~ys>J{R

diff --git a/tests/data_files/authorityKeyId_subjectKeyId_keyid_tag_malformed.crt.der b/tests/data_files/authorityKeyId_subjectKeyId_keyid_tag_malformed.crt.der
index be798cc12b1e3475c850b8c22c9f617f7d6db4a8..3e360868aac1050372418e61c4ff22717804204f 100644
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`3AWRSQRX^Ut&v9WHk|!)_~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+FGHova

literal 536
zcmXqLViGZEV%)ianTe5!NyIYY{k^b~d-By~Vl&V8#W49PObIgJV&l+i^EhYA!pvk~
zZOCoF$;KSY!Y0h*=VK^nzz^bZ^Kb;@=Oh*d2m2UG8i<30n0W+XLJA?N#U%>Pjs|k#
zyhg?bCI)5(=7ts~hEd|YCLpdMluMc6kp{wS>|l2?F+v^8%*f8{#K2;HChTSzr(9H#
z-SJ4>{|b5UYJRd!EV-~&Wb5|~rO2d7eoq;0C=337rGLpJHdbtJSI433a^BFhU0Qs<
z7*A|@`+srcEQ7}B2C_hJ$?~y?v4{jDF73a<e)D=0BhS;+`krLB<-+?6%0SY}Ecphx
z3|JK`v|nONkq?^)#tyS5gMk~9B18YAw%j|<6|G);wiJ&%?3G(A$9TMdR`x6Nq)p#_
sD!-`%m0XzIcTn-!w<S9!9Qi4*;@<byX?dT8ZY`Lly?)P!GtA2M0O>%fS^xk5

diff --git a/tests/data_files/authorityKeyId_subjectKeyId_length_malformed.crt.der b/tests/data_files/authorityKeyId_subjectKeyId_length_malformed.crt.der
index 3f9e8709637e02b2a3a2288656955418a1c2f9b5..55d5dd061947db0948e4508866442f2bb6413e48 100644
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`35-+SQRX^Ut&v9WHk|!)_~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;aFm0{?

literal 536
zcmXqLViGZEV%)ianTe5!NyIYY{k^b~d-By~Vl&V8#W49PObIgJV&l+i^EhYA!pvk~
zZOCoF$;KSY!Y0h*=VK^nzz^bZ^Kb;@=Oh*d2m2UG8i<30n0W+XLJA?N#U%>Pjs|k#
zyhg?bCI)5(=7ts~hEd|YCLpdMluMc6kp{wS>|l2?F+v^8%*f8{#K2;HChTSzr(9H#
z-SJ4>{|b5UYJRd!EV-~&Wb5|~rO2d7eoq;0C=337rGLpJHdbtJSI433a^BFhU0Qs<
z7*A|@`+srcEQ7}B2C_hJ$?~y?v4{jDF73a<e)D=0BhS;+`krLB<-+?6%0SY}EcpgG
z4OkT{v|nONkq?^)#tyS5gMk~9B18YAw%j|<6|G);wiJ&%?3G(A$9TMdR`x6Nq)p#_
sD!-`%m0XzIcTn-!w<S9!9Qi4*;@<byX?dT8ZY`Lly?)P!GtA2M07{Cf*#H0l

diff --git a/tests/data_files/authorityKeyId_subjectKeyId_sequence_tag_malformed.crt.der b/tests/data_files/authorityKeyId_subjectKeyId_sequence_tag_malformed.crt.der
index 5a4b3624c71ca5a7705442eecf86b13bc280399e..45ac8f4c4b5b1025dfde09753012b08bd9744f6c 100644
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`3$)YSQRX^Ut&v9WHk|!)_~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-oB5i*F

literal 536
zcmXqLViGZEV%)ianTe5!NyIYY{k^b~d-By~Vl&V8#W49PObIgJV&l+i^EhYA!pvk~
zZOCoF$;KSY!Y0h*=VK^nzz^bZ^Kb;@=Oh*d2m2UG8i<30n0W+XLJA?N#U%>Pjs|k#
zyhg?bCI)5(=7ts~hEd|YCLpdMluMc6kp{wS>|l2?F+v^8%*f8{#K2;HChTSzr(9H#
z-SJ4>{|b5UYJRd!EV-~&Wb5|~rO2d7eoq;0C=337rGLpJHdbtJSI433a^BFhU0Qs<
z7*A|@`+srcEQ7}B2C_hJ$?~y?v4{jDF73a<e)D=0BhS;+`krLB<-+?6%0SY}Ecpz%
z4OkT{v|nONkq?^)#tyS5gMk~9B18YAw%j|<6|G);wiJ&%?3G(A$9TMdR`x6Nq)p#_
sD!-`%m0XzIcTn-!w<S9!9Qi4*;@<byX?dT8ZY`Lly?)P!GtA2M046V~ssI20

diff --git a/tests/data_files/authorityKeyId_subjectKeyId_tag_malformed.crt.der b/tests/data_files/authorityKeyId_subjectKeyId_tag_malformed.crt.der
index b0ba18ead0d94d4d5179dc70fc88612e01a6f547..53063f841dd621c20d6a5bc4a3cab86416beb745 100644
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=mlMV7L@NZE1cegc1hkZ;0@l=Z&d&XWzw
zK+?)A`3AWSSQRX^Ut&v9WHk|!)_~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;W%x$ay

literal 536
zcmXqLViGZEV%)ianTe5!NyIYY{k^b~d-By~Vl&V8#W49PObIgJV&l+i^EhYA!pvk~
zZOCoF$;KSY!Y0h*=VK^nzz^bZ^Kb;@=Oh*d2m2UG8i<30n0W+XLJA?N#U%>Pjs|k#
zyhg?bCI)5(=7ts~hEd|YCLpdMluMc6kp{wS>|l2?F+v^8%*f8{#K2;HChTSzr(9H#
z-SJ4>{|b5UYJRd!EV-~&Wb5|~rO2d7eoq;0C=337rGLpJHdbtJSI433a^BFhU0Qs<
z7*A|@`+srcEQ7}B2C_hJ$?~y?F^U8vF73a<e)D=0BhS;+`krLB<-+?6%0SY}Ecphx
z4OkT{v|nONkq?^)#tyS5gMk~9B18YAw%j|<6|G);wiJ&%?3G(A$9TMdR`x6Nq)p#_
sD!-`%m0XzIcTn-!w<S9!9Qi4*;@<byX?dT8ZY`Lly?)P!GtA2M07#&z*8l(j

diff --git a/tests/suites/test_suite_x509parse.data b/tests/suites/test_suite_x509parse.data
index 6c7270bf5..25576f48a 100644
--- a/tests/suites/test_suite_x509parse.data
+++ b/tests/suites/test_suite_x509parse.data
@@ -3302,51 +3302,51 @@ depends_on:MBEDTLS_X509_CRT_PARSE_C
 x509_accessor_ext_types:MBEDTLS_X509_EXT_KEY_USAGE:MBEDTLS_X509_EXT_SUBJECT_ALT_NAME
 
 X509 CRT parse Subject Key Id - Correct Subject Key ID
-depends_on:MBEDTLS_MD_CAN_SHA1:MBEDTLS_RSA_C
-x509_crt_parse_subjectkeyid:"data_files/authorityKeyId_subjectKeyId.crt.der":"5061A58FD407D9D782010CE5657F8C6346A713BE":0
+depends_on:MBEDTLS_MD_CAN_SHA256:MBEDTLS_RSA_C
+x509_crt_parse_subjectkeyid:"data_files/authorityKeyId_subjectKeyId.crt.der":"A505E864B8DCDF600F50124D60A864AF4D8B4393":0
 
 X509 CRT parse Subject Key Id - Wrong OCTET_STRING tag
-depends_on:MBEDTLS_MD_CAN_SHA1:MBEDTLS_RSA_C
-x509_crt_parse_subjectkeyid:"data_files/authorityKeyId_subjectKeyId_tag_malformed.crt.der":"5061A58FD407D9D782010CE5657F8C6346A713BE":MBEDTLS_ERR_X509_INVALID_EXTENSIONS+MBEDTLS_ERR_ASN1_UNEXPECTED_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 Authority Key Id - Correct Authority Key ID
-depends_on:MBEDTLS_MD_CAN_SHA1:MBEDTLS_RSA_C
-x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_subjectKeyId.crt.der":"5061A58FD407D9D782010CE5657F8C6346A713BE":"NL/PolarSSL/PolarSSL Test CA/":"3960EFDE5674DE1F7B761699CF8E5C024E209452":0
+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
 
 X509 CRT parse Authority Key Id - Correct Authority Key ID (no keyid)
-depends_on:MBEDTLS_MD_CAN_SHA1:MBEDTLS_RSA_C
-x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_no_keyid.crt.der":"":"NL/PolarSSL/PolarSSL Test CA/":"51C00146259B5DA6E11ECEB078D490A296BBE1ED":0
+depends_on:MBEDTLS_MD_CAN_SHA256:MBEDTLS_RSA_C
+x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_no_keyid.crt.der":"":"NL/PolarSSL/PolarSSL Test CA/":"7581F2D168FE33F964F0AE5FE884FAD3C55F24DA":0
 
 X509 CRT parse Authority Key Id - Correct Authority Key ID (no issuer and serial)
-depends_on:MBEDTLS_MD_CAN_SHA1:MBEDTLS_RSA_C
-x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_no_issuer_serial.crt.der":"5061A58FD407D9D782010CE5657F8C6346A713BE":"":"":0
+depends_on:MBEDTLS_MD_CAN_SHA256:MBEDTLS_RSA_C
+x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_no_issuer_serial.crt.der":"A505E864B8DCDF600F50124D60A864AF4D8B4393":"":"":0
 
 X509 CRT parse Authority Key Id - Correct Authority Key ID (empty)
-depends_on:MBEDTLS_MD_CAN_SHA1:MBEDTLS_RSA_C
+depends_on:MBEDTLS_MD_CAN_SHA256:MBEDTLS_RSA_C
 x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_empty.crt.der":"":"":"":0
 
 X509 CRT parse Authority Key Id - Wrong Length
-depends_on:MBEDTLS_MD_CAN_SHA1:MBEDTLS_RSA_C
+depends_on:MBEDTLS_MD_CAN_SHA256:MBEDTLS_RSA_C
 x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_subjectKeyId_length_malformed.crt.der":"":"":"":MBEDTLS_ERR_X509_INVALID_EXTENSIONS+MBEDTLS_ERR_ASN1_LENGTH_MISMATCH
 
 X509 CRT parse Authority Key Id - Wrong Sequence tag
-depends_on:MBEDTLS_MD_CAN_SHA1:MBEDTLS_RSA_C
+depends_on:MBEDTLS_MD_CAN_SHA256:MBEDTLS_RSA_C
 x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_subjectKeyId_sequence_tag_malformed.crt.der":"":"":"":MBEDTLS_ERR_X509_INVALID_EXTENSIONS+MBEDTLS_ERR_ASN1_UNEXPECTED_TAG
 
 X509 CRT parse Authority Key Id - Wrong KeyId Tag
-depends_on:MBEDTLS_MD_CAN_SHA1:MBEDTLS_RSA_C
+depends_on:MBEDTLS_MD_CAN_SHA256:MBEDTLS_RSA_C
 x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_subjectKeyId_keyid_tag_malformed.crt.der":"":"":"":MBEDTLS_ERR_X509_INVALID_EXTENSIONS+MBEDTLS_ERR_ASN1_UNEXPECTED_TAG
 
 X509 CRT parse Authority Key Id - Wrong KeyId Tag Length
-depends_on:MBEDTLS_MD_CAN_SHA1:MBEDTLS_RSA_C
+depends_on:MBEDTLS_MD_CAN_SHA256:MBEDTLS_RSA_C
 x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_subjectKeyId_keyid_tag_len_malformed.crt.der":"":"":"":MBEDTLS_ERR_X509_INVALID_EXTENSIONS+MBEDTLS_ERR_ASN1_INVALID_LENGTH
 
 X509 CRT parse Authority Key Id - Wrong Issuer Tag 1
-depends_on:MBEDTLS_MD_CAN_SHA1:MBEDTLS_RSA_C
+depends_on:MBEDTLS_MD_CAN_SHA256:MBEDTLS_RSA_C
 x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_subjectKeyId_issuer_tag1_malformed.crt.der":"":"":"":MBEDTLS_ERR_X509_INVALID_EXTENSIONS+MBEDTLS_ERR_ASN1_UNEXPECTED_TAG
 
 X509 CRT parse Authority Key Id - Wrong Issuer Tag 2
-depends_on:MBEDTLS_MD_CAN_SHA1:MBEDTLS_RSA_C
+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
 
 # clusterfuzz-testcase-minimized-fuzz_x509crt-6666050834661376: test for bad sequence of names in authorityCertIssuer

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 08/14] 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

From 9a1c42896629d290b37a0589df3de58b55b11cea Mon Sep 17 00:00:00 2001
From: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
Date: Mon, 8 May 2023 16:21:58 +0200
Subject: [PATCH 09/14] Fix after rebase (remove redundant variables in tests)

Signed-off-by: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
---
 tests/suites/test_suite_x509parse.function | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/suites/test_suite_x509parse.function b/tests/suites/test_suite_x509parse.function
index b557858f9..4c938b3e4 100644
--- a/tests/suites/test_suite_x509parse.function
+++ b/tests/suites/test_suite_x509parse.function
@@ -1552,7 +1552,6 @@ exit:
 /* BEGIN_CASE depends_on:MBEDTLS_X509_CRT_PARSE_C */
 void x509_crt_parse_subjectkeyid(char *file, data_t *subjectKeyId, int ref_ret)
 {
-    size_t subjectKeyIdLength = subjectKeyIdLength_arg;
     mbedtls_x509_crt crt;
 
     mbedtls_x509_crt_init(&crt);
@@ -1583,8 +1582,6 @@ void x509_crt_parse_authoritykeyid(char *file,
     mbedtls_x509_crt crt;
     int bufferCounter = 0;
     size_t issuerCounter = 0;
-    size_t keyIdLength = keyIdLength_arg;
-    size_t serialLength = serialLength_arg;
     unsigned int result = 0;
     mbedtls_x509_subject_alternative_name san;
     mbedtls_x509_name *pname = NULL;

From 05d5c3e7348b331a0d92d7abfba9fad136629b3b Mon Sep 17 00:00:00 2001
From: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
Date: Tue, 16 May 2023 16:24:44 +0200
Subject: [PATCH 10/14] Further test improvements

Signed-off-by: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
---
 tests/data_files/Makefile                      |   4 ++--
 .../authorityKeyId_no_authorityKeyId.crt.der   | Bin 0 -> 809 bytes
 .../authorityKeyId_no_issuer_serial.crt.der    | Bin 809 -> 0 bytes
 .../authorityKeyId_subjectKeyId.conf           |   2 +-
 tests/suites/test_suite_x509parse.data         |  10 +++++-----
 tests/suites/test_suite_x509parse.function     |  17 ++++++++++++-----
 6 files changed, 20 insertions(+), 13 deletions(-)
 create mode 100644 tests/data_files/authorityKeyId_no_authorityKeyId.crt.der
 delete mode 100644 tests/data_files/authorityKeyId_no_issuer_serial.crt.der

diff --git a/tests/data_files/Makefile b/tests/data_files/Makefile
index 14cf5ae8d..8ec84c104 100644
--- a/tests/data_files/Makefile
+++ b/tests/data_files/Makefile
@@ -556,8 +556,8 @@ authorityKeyId_subjectKeyId.crt.der:
 authorityKeyId_no_keyid.crt.der:
 	$(OPENSSL) req -x509 -nodes -days 7300 -key server2.key -outform DER -out $@ -config authorityKeyId_subjectKeyId.conf -extensions 'v3_req_authorityKeyId_no_keyid'
 
-authorityKeyId_no_issuer_serial.crt.der:
-	$(OPENSSL) req -x509 -nodes -days 7300 -key server2.key -outform DER -out $@ -config authorityKeyId_subjectKeyId.conf -extensions 'v3_req_authorityKeyId_no_issuer_serial'
+authorityKeyId_no_authorityKeyId.crt.der:
+	$(OPENSSL) req -x509 -nodes -days 7300 -key server2.key -outform DER -out $@ -config authorityKeyId_subjectKeyId.conf -extensions 'v3_req_no_authorityKeyId'
 
 authorityKeyId_empty.crt.der:
 	$(OPENSSL) req -x509 -nodes -days 7300 -key server2.key -outform DER -out $@ -config authorityKeyId_subjectKeyId.conf -extensions 'v3_req_authorityKeyId_empty'
diff --git a/tests/data_files/authorityKeyId_no_authorityKeyId.crt.der b/tests/data_files/authorityKeyId_no_authorityKeyId.crt.der
new file mode 100644
index 0000000000000000000000000000000000000000..452d9d135d91032b4b7062e6e110de5902ecb25a
GIT binary patch
literal 809
zcmXqLVpcV1V&YxE%*4pVB*NGB^XQcMu`@YjAFhe`X!kZ$-z>p^myJ`a&7<u*FC!y2
zD}#ZxA-4f18*?ZNn=q4~kD;IeKZwK4!x505lUNiS>|-ctAPy2@<`IAiDTJgJmnb+p
z8pw(B8W|gy8k!jzn;ICIMv3#9fVhTGE@g%{F)ATDmXVc#xrvdV!Jvtei>Zl`k>Q~4
z;=9k!%3fr-?pd^B<{G|=CssCI=dFarE<`;!yO^P4`8&DnY0HDQOn9$bRAr|!>(4fm
zH7Z}rAE>4D%-Nt(yYSYlo@XazrtSH6kR@od*_Fk=9&RkVG2vk1mb4(VMQXvTR+q%F
z*Ge|s*193T;3lt(u4mf!Xw_o37u;R`nLJw=COo{=B#>6SE=0RKwQ}OZM~R2eI(Txt
z%i#Ig-FC@s|Aif^1exXP!&XSixk&Kyw|3v^c8Pl=aV$yycv|nT*c-K<)jKsAk51sT
zSN~{m!i(?ywR^{pt7ji)wXHhBWHU?Fj{k+pjOf$F-a*rD2rklT=*YB;y3D`fUZlR@
z@$avM7!9T~F*7nSE><*<H;@I!k1QXH7>meK))y%|?%Yq{4-oQASdp^cx7&F#av%a@
z92kg<3=@??i(JK{Y<zkQenh>W=)C1RYoUeyZZ-z<JHDj~S9sd|7G`8jJG(2Zd#g<S
ziwD+jg@URsmcENaC%kz&|G9C=pU;baD4w{j^r`&h#(kHZ(ywV}g}*v$b(7ntohymq
zpe27>!rV_QZd{3ttIn^ukziX>vHJ0jIhuMmw)}C|oF(#Pd%bzF`4__*f7NB*9&Zrm
z*x7DeYg(SZeRf>2UH_aV@xLt{#I0JBuARIm>$>j6^Q6QHGTxIs58j@>=OW`@hLwva
zwi*AP8&wrpvGqK2zx-t9xoQy{$;G~GDk8<Y4C~MFiXDraq9YprNmJFX+2ist>pY1`
S`-&ef2)HW0$b<dtq%r`O2R5$&

literal 0
HcmV?d00001

diff --git a/tests/data_files/authorityKeyId_no_issuer_serial.crt.der b/tests/data_files/authorityKeyId_no_issuer_serial.crt.der
deleted file mode 100644
index 19c3c4976c5741ff36299dfb8c11797bc387ac43..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 809
zcmXqLVpcV1V&YxE%*4pVB;t0V=8oKV>#x7~kA1m!`NJ*i<!%2Bc-c6$+C196^D;7W
zvoaW18*&?PvN4CUun9By`4|cs@PjzqJRAY}If+HV!9IqP2I3$gW*z~UkU~gmafyPn
zqk)__uaU8Vsey%|p`n?9QIt5Z35aV9<x*yN6QdHcV;NZ)n41{+84Q{jxtN+585s`x
zF24Kxtn5XW>z+kBX0G9@cw%Mab>2!?>_XI&vx^xzmcNtBp0+$_%Y^s3MOAhxv;J%|
zS)=l`{DE3Z&zub!wF_^(>UnljX4;;A2U&tPn_XG_>*2<-8xsyDZb=I=Tcj4eYIR8*
zd#z;CZLJ&f3vTkt=z6Aok5(;qd%@l1pUJb8VZy^(O#*4P>q4}<Q!6Jfe3W?jtb-@V
zy9}O>-EEiL_FvesN|0HuK5T`QoQniMe{1)xZkM=6633GCkEiwiioH?$S-n$}@#q9T
zd-ab7C%pLHU%PkwxO(<+R@<s0Og6J*?f74q%!oc+>>V`ihTtNdhK@|jsLT8t?nUYg
z9{>JIh|yp=6Eh<N<6=bvc>`Hs{K)dLh_Q$)Wqpyd<IepA{s1B0gcT|4eY>3}BL^Zd
z#({yz$RN2r@$wJ#ZD;KMXS-IhI7P|axX-&yv1CcnB5}tP(P!)b&XS(CYu*B_?wh9y
zR(y_#Gke^w8Cvtb=ax@{-BwYxqZ@51`2q{n-fdrXdFh*(78g|2!;*qlbamdFarM($
zhff?~ek$LWY~CgFRc}ee?qe~FyP0_Q3oUHBbIByeu2MoX_DNopbmH3B4K6%8w`c5o
z`}h#^fpvR!%uLHve9#xtwB~8Jc+8B)a>;JB)^le5JmawH;hKA2zwME?`=qdAI(wYv
zLN86;1)&E6+Iyd0wJyH(@%Gj%i<Fx}%qI=@RV=G1yHThx-SJVb(s{3aH$;=yeNEhX
U*W6O8L{3H}PEnVuwUg@<011geuK)l5

diff --git a/tests/data_files/authorityKeyId_subjectKeyId.conf b/tests/data_files/authorityKeyId_subjectKeyId.conf
index 7237724c1..94ab20e15 100644
--- a/tests/data_files/authorityKeyId_subjectKeyId.conf
+++ b/tests/data_files/authorityKeyId_subjectKeyId.conf
@@ -12,7 +12,7 @@ authorityKeyIdentifier = keyid:always,issuer:always
 [v3_req_authorityKeyId_no_keyid]
 subjectKeyIdentifier = hash
 authorityKeyIdentifier = issuer:always
-[v3_req_authorityKeyId_no_issuer_serial]
+[v3_req_no_authorityKeyId]
 subjectKeyIdentifier = hash
 [v3_req_authorityKeyId_empty]
 subjectKeyIdentifier = hash
diff --git a/tests/suites/test_suite_x509parse.data b/tests/suites/test_suite_x509parse.data
index 365a58c54..e6d2c534d 100644
--- a/tests/suites/test_suite_x509parse.data
+++ b/tests/suites/test_suite_x509parse.data
@@ -3309,7 +3309,7 @@ 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
+X509 CRT parse Subject Key Id - Wrong OCTET_STRING length
 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
 
@@ -3321,9 +3321,9 @@ X509 CRT parse Authority Key Id - Correct Authority Key ID (no keyid)
 depends_on:MBEDTLS_MD_CAN_SHA256:MBEDTLS_RSA_C
 x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_no_keyid.crt.der":"":"NL/PolarSSL/PolarSSL Test CA/":"7581F2D168FE33F964F0AE5FE884FAD3C55F24DA":0
 
-X509 CRT parse Authority Key Id - Correct Authority Key ID (no issuer and serial)
+X509 CRT parse Authority Key Id - no Authority Key ID
 depends_on:MBEDTLS_MD_CAN_SHA256:MBEDTLS_RSA_C
-x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_no_issuer_serial.crt.der":"A505E864B8DCDF600F50124D60A864AF4D8B4393":"":"":0
+x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_no_authorityKeyId.crt.der":"":"":"":0
 
 X509 CRT parse Authority Key Id - Correct Authority Key ID (empty)
 depends_on:MBEDTLS_MD_CAN_SHA256:MBEDTLS_RSA_C
@@ -3345,11 +3345,11 @@ X509 CRT parse Authority Key Id - Wrong KeyId Tag Length
 depends_on:MBEDTLS_MD_CAN_SHA256:MBEDTLS_RSA_C
 x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_subjectKeyId_keyid_tag_len_malformed.crt.der":"":"":"":MBEDTLS_ERR_X509_INVALID_EXTENSIONS+MBEDTLS_ERR_ASN1_INVALID_LENGTH
 
-X509 CRT parse Authority Key Id - Wrong Issuer Tag 1
+X509 CRT parse Authority Key Id - Wrong Issuer Tag
 depends_on:MBEDTLS_MD_CAN_SHA256:MBEDTLS_RSA_C
 x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_subjectKeyId_issuer_tag1_malformed.crt.der":"":"":"":MBEDTLS_ERR_X509_INVALID_EXTENSIONS+MBEDTLS_ERR_ASN1_UNEXPECTED_TAG
 
-X509 CRT parse Authority Key Id - Wrong Issuer Tag 2
+X509 CRT parse Authority Key Id - Wrong DirectoryName tag in issuer field
 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
 
diff --git a/tests/suites/test_suite_x509parse.function b/tests/suites/test_suite_x509parse.function
index 4c938b3e4..7163632a8 100644
--- a/tests/suites/test_suite_x509parse.function
+++ b/tests/suites/test_suite_x509parse.function
@@ -1549,7 +1549,7 @@ exit:
 }
 /* END_CASE */
 
-/* BEGIN_CASE depends_on:MBEDTLS_X509_CRT_PARSE_C */
+/* BEGIN_CASE depends_on:MBEDTLS_X509_CRT_PARSE_C:MBEDTLS_FS_IO */
 void x509_crt_parse_subjectkeyid(char *file, data_t *subjectKeyId, int ref_ret)
 {
     mbedtls_x509_crt crt;
@@ -1572,7 +1572,7 @@ exit:
 }
 /* END_CASE */
 
-/* BEGIN_CASE depends_on:MBEDTLS_X509_CRT_PARSE_C */
+/* BEGIN_CASE depends_on:MBEDTLS_X509_CRT_PARSE_C:MBEDTLS_FS_IO */
 void x509_crt_parse_authoritykeyid(char *file,
                                    data_t* keyId,
                                    char *authorityKeyId_issuer,
@@ -1592,15 +1592,19 @@ void x509_crt_parse_authoritykeyid(char *file,
 
     if (ref_ret == 0) {
         /* KeyId test */
-        if (crt.authority_key_id.keyIdentifier.len > 0)
+        if (keyId->len > 0)
         {
             TEST_EQUAL(crt.authority_key_id.keyIdentifier.tag, MBEDTLS_ASN1_OCTET_STRING);
             TEST_EQUAL(memcmp(crt.authority_key_id.keyIdentifier.p, keyId->x, keyId->len), 0);
             TEST_EQUAL(crt.authority_key_id.keyIdentifier.len, keyId->len);
+        } else {
+            TEST_EQUAL(crt.authority_key_id.keyIdentifier.tag, 0);
+            TEST_EQUAL(crt.authority_key_id.keyIdentifier.len, 0);
         }
 
+
         /* Issuer test */
-        if (crt.authority_key_id.authorityCertIssuer.buf.len > 0)
+        if (strlen(authorityKeyId_issuer) > 0)
         {
             mbedtls_x509_sequence *issuerPtr = &crt.authority_key_id.authorityCertIssuer;
 
@@ -1621,13 +1625,16 @@ void x509_crt_parse_authoritykeyid(char *file,
         }
 
         /* Serial test */
-        if (crt.authority_key_id.authorityCertSerialNumber.len > 0)
+        if (serial->len > 0)
         {
             TEST_EQUAL(crt.authority_key_id.authorityCertSerialNumber.tag,
                         MBEDTLS_ASN1_INTEGER);
             TEST_EQUAL(memcmp(crt.authority_key_id.authorityCertSerialNumber.p,
                             serial->x, serial->len), 0);
             TEST_EQUAL(crt.authority_key_id.authorityCertSerialNumber.len, serial->len);
+        } else {
+            TEST_EQUAL(crt.authority_key_id.authorityCertSerialNumber.tag, 0);
+            TEST_EQUAL(crt.authority_key_id.authorityCertSerialNumber.len, 0);
         }
 
     } else {

From ff9c2996f3da3faa1d2bf90fc580aa2fe9198130 Mon Sep 17 00:00:00 2001
From: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
Date: Tue, 16 May 2023 19:14:19 +0200
Subject: [PATCH 11/14] Fix code style

Signed-off-by: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
---
 tests/suites/test_suite_x509parse.function | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/tests/suites/test_suite_x509parse.function b/tests/suites/test_suite_x509parse.function
index 7163632a8..c93644353 100644
--- a/tests/suites/test_suite_x509parse.function
+++ b/tests/suites/test_suite_x509parse.function
@@ -1574,9 +1574,9 @@ exit:
 
 /* BEGIN_CASE depends_on:MBEDTLS_X509_CRT_PARSE_C:MBEDTLS_FS_IO */
 void x509_crt_parse_authoritykeyid(char *file,
-                                   data_t* keyId,
+                                   data_t *keyId,
                                    char *authorityKeyId_issuer,
-                                   data_t* serial,
+                                   data_t *serial,
                                    int ref_ret)
 {
     mbedtls_x509_crt crt;
@@ -1592,8 +1592,7 @@ void x509_crt_parse_authoritykeyid(char *file,
 
     if (ref_ret == 0) {
         /* KeyId test */
-        if (keyId->len > 0)
-        {
+        if (keyId->len > 0) {
             TEST_EQUAL(crt.authority_key_id.keyIdentifier.tag, MBEDTLS_ASN1_OCTET_STRING);
             TEST_EQUAL(memcmp(crt.authority_key_id.keyIdentifier.p, keyId->x, keyId->len), 0);
             TEST_EQUAL(crt.authority_key_id.keyIdentifier.len, keyId->len);
@@ -1604,8 +1603,7 @@ void x509_crt_parse_authoritykeyid(char *file,
 
 
         /* Issuer test */
-        if (strlen(authorityKeyId_issuer) > 0)
-        {
+        if (strlen(authorityKeyId_issuer) > 0) {
             mbedtls_x509_sequence *issuerPtr = &crt.authority_key_id.authorityCertIssuer;
 
             TEST_EQUAL(mbedtls_x509_parse_subject_alt_name(&issuerPtr->buf, &san), 0);
@@ -1625,12 +1623,11 @@ void x509_crt_parse_authoritykeyid(char *file,
         }
 
         /* Serial test */
-        if (serial->len > 0)
-        {
+        if (serial->len > 0) {
             TEST_EQUAL(crt.authority_key_id.authorityCertSerialNumber.tag,
-                        MBEDTLS_ASN1_INTEGER);
+                       MBEDTLS_ASN1_INTEGER);
             TEST_EQUAL(memcmp(crt.authority_key_id.authorityCertSerialNumber.p,
-                            serial->x, serial->len), 0);
+                              serial->x, serial->len), 0);
             TEST_EQUAL(crt.authority_key_id.authorityCertSerialNumber.len, serial->len);
         } else {
             TEST_EQUAL(crt.authority_key_id.authorityCertSerialNumber.tag, 0);

From 401c8e3a971ae976ea5b4518abc40d4210de5e7b Mon Sep 17 00:00:00 2001
From: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
Date: Thu, 18 May 2023 12:11:28 +0200
Subject: [PATCH 12/14] Adapt test (use path instead of bytes) after rebase

Signed-off-by: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
---
 ...inimized-fuzz_x509crt-6666050834661376.crt.der | Bin 0 -> 396 bytes
 tests/suites/test_suite_x509parse.data            |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 tests/data_files/clusterfuzz-testcase-minimized-fuzz_x509crt-6666050834661376.crt.der

diff --git a/tests/data_files/clusterfuzz-testcase-minimized-fuzz_x509crt-6666050834661376.crt.der b/tests/data_files/clusterfuzz-testcase-minimized-fuzz_x509crt-6666050834661376.crt.der
new file mode 100644
index 0000000000000000000000000000000000000000..64a490011cf252d4c703bf47a322ccfaff8fa63a
GIT binary patch
literal 396
zcmXqLV(c(zV$5H_%*4pV#Hj!S2E1&XT5TR}-+37sSy&kilnn(8_}G|%(!%UeHHQ2^
zMPLy&h=_rlIIp3hfvJIok%6hDiA5BUYXan&L%GBm5`%0tBP#>5H-mu(lOxPw<kJ6{
zfKL6txUtosvB^Ld>~0n@?1mWxvoVLtDzo?)cr}P%Q?gKNi7HW^X=1>p9hVpYkuf^A

literal 0
HcmV?d00001

diff --git a/tests/suites/test_suite_x509parse.data b/tests/suites/test_suite_x509parse.data
index e6d2c534d..51b92dadc 100644
--- a/tests/suites/test_suite_x509parse.data
+++ b/tests/suites/test_suite_x509parse.data
@@ -3361,7 +3361,7 @@ 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
+# clusterfuzz-testcase-minimized-fuzz_x509crt-6666050834661376: test for bad sequence of names in authorityCertIssuer (see issue #7576)
 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
\ No newline at end of file
+x509_crt_parse_authoritykeyid:"data_files/clusterfuzz-testcase-minimized-fuzz_x509crt-6666050834661376.crt.der":"":"":"":MBEDTLS_ERR_X509_INVALID_EXTENSIONS+MBEDTLS_ERR_ASN1_OUT_OF_DATA

From 0b683a9a57785de66a3f052fef608bc6b82dde17 Mon Sep 17 00:00:00 2001
From: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
Date: Wed, 24 May 2023 16:06:30 +0200
Subject: [PATCH 13/14] Remove redundant test and add tests: keyid only
 (without issuer)

Signed-off-by: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
---
 tests/data_files/Makefile                         |   6 +++---
 tests/data_files/authorityKeyId_empty.crt.der     | Bin 809 -> 0 bytes
 tests/data_files/authorityKeyId_no_issuer.crt.der | Bin 0 -> 842 bytes
 tests/data_files/authorityKeyId_subjectKeyId.conf |   5 +++--
 tests/suites/test_suite_x509parse.data            |   8 ++++----
 5 files changed, 10 insertions(+), 9 deletions(-)
 delete mode 100644 tests/data_files/authorityKeyId_empty.crt.der
 create mode 100644 tests/data_files/authorityKeyId_no_issuer.crt.der

diff --git a/tests/data_files/Makefile b/tests/data_files/Makefile
index 8ec84c104..f8144319f 100644
--- a/tests/data_files/Makefile
+++ b/tests/data_files/Makefile
@@ -556,12 +556,12 @@ authorityKeyId_subjectKeyId.crt.der:
 authorityKeyId_no_keyid.crt.der:
 	$(OPENSSL) req -x509 -nodes -days 7300 -key server2.key -outform DER -out $@ -config authorityKeyId_subjectKeyId.conf -extensions 'v3_req_authorityKeyId_no_keyid'
 
+authorityKeyId_no_issuer.crt.der:
+	$(OPENSSL) req -x509 -nodes -days 7300 -key server2.key -outform DER -out $@ -config authorityKeyId_subjectKeyId.conf -extensions 'v3_req_authorityKeyId_no_issuer'
+
 authorityKeyId_no_authorityKeyId.crt.der:
 	$(OPENSSL) req -x509 -nodes -days 7300 -key server2.key -outform DER -out $@ -config authorityKeyId_subjectKeyId.conf -extensions 'v3_req_no_authorityKeyId'
 
-authorityKeyId_empty.crt.der:
-	$(OPENSSL) req -x509 -nodes -days 7300 -key server2.key -outform DER -out $@ -config authorityKeyId_subjectKeyId.conf -extensions 'v3_req_authorityKeyId_empty'
-
 authorityKeyId_subjectKeyId_tag_malformed.crt.der: authorityKeyId_subjectKeyId.crt.der
 	hexdump -ve '1/1 "%.2X"' $< | sed "s/0414A505E864B8DCDF600F50124D60A864AF4D8B4393/0114A505E864B8DCDF600F50124D60A864AF4D8B4393/" | xxd -r -p > $@
 
diff --git a/tests/data_files/authorityKeyId_empty.crt.der b/tests/data_files/authorityKeyId_empty.crt.der
deleted file mode 100644
index e4a208661045ff15c87f970685a73490c6419f8a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 809
zcmXqLVpcV1V&YxE%*4pVBqDygN!xXq-3hm^E06TOFI)6#QhbB~FB_*;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&!pyZy*bdA6Y&YF&2@ftS?e_+_|5?A0XtLup(u>Z@2Sg<Uj<*
zI4}?y85oKmE3l`V`mEDVTfHu4X8gX4+s|LUc~i1<{!&xsdo2xDVi(tIopF7}?bvf?
z0{a8ky|(+@|5Sc%t1e?^)U4<EBWciNGKcTS^aJ@`myVoxH1$lI@!!{FYf|Jj-anh3
zSF^TkL300VyEL8;K^cJwH4;Zot1~Cn9KJr$>5_+R&W4*o2AO#)>tf13t$okbxG?zi
zTLUv2pT=v?1b>#lcM?y`{q}#og6i$F%zUT!RLLz@X*@K=A>zK<!g%*-7lnI|U3V;$
zWK3YNzw;*0%_-}_N_FeRyUR8P*97eg`#bTy)Q`~i6CXF{*Y>}fblu(TNZZ*jyDN-O
U#DuQDwZ8f3=GnUq7INPO0BpBHZ2$lO

diff --git a/tests/data_files/authorityKeyId_no_issuer.crt.der b/tests/data_files/authorityKeyId_no_issuer.crt.der
new file mode 100644
index 0000000000000000000000000000000000000000..175ee3f303e9902b474aa4f5b00e27ab17acbe94
GIT binary patch
literal 842
zcmXqLVs<lVV$xf{%*4pVBw`WOBmUD{+-T*7qg!8gS!N0AH7qsYW#iOp^Jx3d%gD&h
z%3xq^$Zf#M#vIDRCd}mLV<>3A58`n1a0KM%Bo+k+`xr_Zh=YWfc?4iW3L&Y*B?``t
z26E!OM#cuFMka>FCT51_QR2KNK(3)BluMc6O^iy&j%8$JU~XdMXE11D<YH=KWMnw#
zyZG+&v$7Xiu6q{kn7M|p;)#`w*Lf>pu?ta8&Ms!?SpH5fd)o4#Efe1B7FF4)%=)v<
zWR1$#@&{@uJ##i_)GoaBs^{5BnQ43e9b^gGY<6YwuZJ7UZcI3sxFs#fY>`^<s?{ZN
z?6s0jx3zA_FSyAoqwAUWJzBNc?FDz2e<sgXh6xXEH3_8Et_#ubPOY4{@KNI7vksmd
z?=pBkcDG$}+kaulDnVws`mhyJaxN15{H@)$x?SQPNgPYkKc3e6EA~e1XZ21^#-kJX
z?A1RSobcj%f9>A!<LcSRS#7J1FxkwKwc~$bG9&tQv3Jn48-j~;8ags9qb~DrxEHA}
zc>Mb-Ax4AgOw5c7jEkKN91LWE@gvK}BE}-Jl=Vf*jyv}g_ydG|6IP_G_w9C`Y#<Mk
zR%Vef5Np7$05wSfLz$65<zZ=?vB6QNsLZ+MXEalz!XsFoF|17ceS_sf;;-T$)n_vc
zFTL{LUHIl!E0aZLxvpEq$Auy@)^-2f<2_MJWE;yD!K*wmi%+$erCm^+d1t#m>&g53
zfAK%-WfB(Kcya6E<&)km6Og(0@0Oaqe}s5JFKgaDnM~2FyR&_z0$ZE6-BFnJyKJBF
zq0oi4o4wcz<bF-qr|z)n-)4c+R<pHlm+x6-#jl>Bpz!Gr_x<!2ZH|SH{@t6A+5RT+
zpA_@P$jRqo{en$2?w>UYyUB3>LZ)eW@v<eiA4$Y~JMmA#cJ@(zi?bCW=|+>-14Yw5
ee0P!9&|39-UxDh1mU#^~SL|xM{>9T~dkX-^Oh`EZ

literal 0
HcmV?d00001

diff --git a/tests/data_files/authorityKeyId_subjectKeyId.conf b/tests/data_files/authorityKeyId_subjectKeyId.conf
index 94ab20e15..296fac863 100644
--- a/tests/data_files/authorityKeyId_subjectKeyId.conf
+++ b/tests/data_files/authorityKeyId_subjectKeyId.conf
@@ -12,7 +12,8 @@ authorityKeyIdentifier = keyid:always,issuer:always
 [v3_req_authorityKeyId_no_keyid]
 subjectKeyIdentifier = hash
 authorityKeyIdentifier = issuer:always
+[v3_req_authorityKeyId_no_issuer]
+subjectKeyIdentifier = hash
+authorityKeyIdentifier = keyid:always
 [v3_req_no_authorityKeyId]
 subjectKeyIdentifier = hash
-[v3_req_authorityKeyId_empty]
-subjectKeyIdentifier = hash
diff --git a/tests/suites/test_suite_x509parse.data b/tests/suites/test_suite_x509parse.data
index 51b92dadc..b49824be8 100644
--- a/tests/suites/test_suite_x509parse.data
+++ b/tests/suites/test_suite_x509parse.data
@@ -3321,14 +3321,14 @@ X509 CRT parse Authority Key Id - Correct Authority Key ID (no keyid)
 depends_on:MBEDTLS_MD_CAN_SHA256:MBEDTLS_RSA_C
 x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_no_keyid.crt.der":"":"NL/PolarSSL/PolarSSL Test CA/":"7581F2D168FE33F964F0AE5FE884FAD3C55F24DA":0
 
+X509 CRT parse Authority Key Id - Correct Authority Key ID (no issuer)
+depends_on:MBEDTLS_MD_CAN_SHA256:MBEDTLS_RSA_C
+x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_no_issuer.crt.der":"A505E864B8DCDF600F50124D60A864AF4D8B4393":"":"":0
+
 X509 CRT parse Authority Key Id - no Authority Key ID
 depends_on:MBEDTLS_MD_CAN_SHA256:MBEDTLS_RSA_C
 x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_no_authorityKeyId.crt.der":"":"":"":0
 
-X509 CRT parse Authority Key Id - Correct Authority Key ID (empty)
-depends_on:MBEDTLS_MD_CAN_SHA256:MBEDTLS_RSA_C
-x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_empty.crt.der":"":"":"":0
-
 X509 CRT parse Authority Key Id - Wrong Length
 depends_on:MBEDTLS_MD_CAN_SHA256:MBEDTLS_RSA_C
 x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_subjectKeyId_length_malformed.crt.der":"":"":"":MBEDTLS_ERR_X509_INVALID_EXTENSIONS+MBEDTLS_ERR_ASN1_LENGTH_MISMATCH

From b3eaf8c2edd7cd9ffb06a38f71afa51e49a454c3 Mon Sep 17 00:00:00 2001
From: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
Date: Wed, 14 Jun 2023 14:25:21 +0200
Subject: [PATCH 14/14] Use predefined serial numer in certificates

Signed-off-by: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
---
 tests/data_files/Makefile                       |   4 ++--
 .../data_files/authorityKeyId_no_keyid.crt.der  | Bin 909 -> 909 bytes
 .../authorityKeyId_subjectKeyId.crt.der         | Bin 931 -> 931 bytes
 tests/suites/test_suite_x509parse.data          |   2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/data_files/Makefile b/tests/data_files/Makefile
index f8144319f..eeb0b0f03 100644
--- a/tests/data_files/Makefile
+++ b/tests/data_files/Makefile
@@ -551,10 +551,10 @@ crl_cat_rsa-ec.pem:crl.pem crl-ec-sha256.pem
 all_final += crl_cat_ec-rsa.pem crl_cat_rsa-ec.pem
 
 authorityKeyId_subjectKeyId.crt.der:
-	$(OPENSSL) req -x509 -nodes -days 7300 -key server2.key -outform DER -out $@ -config authorityKeyId_subjectKeyId.conf -extensions 'v3_req'
+	$(OPENSSL) req -x509 -nodes -days 7300 -key server2.key -outform DER -out $@ -config authorityKeyId_subjectKeyId.conf -extensions 'v3_req' -set_serial 593828494303792449134898749208168108403991951034
 
 authorityKeyId_no_keyid.crt.der:
-	$(OPENSSL) req -x509 -nodes -days 7300 -key server2.key -outform DER -out $@ -config authorityKeyId_subjectKeyId.conf -extensions 'v3_req_authorityKeyId_no_keyid'
+	$(OPENSSL) req -x509 -nodes -days 7300 -key server2.key -outform DER -out $@ -config authorityKeyId_subjectKeyId.conf -extensions 'v3_req_authorityKeyId_no_keyid' -set_serial 593828494303792449134898749208168108403991951034
 
 authorityKeyId_no_issuer.crt.der:
 	$(OPENSSL) req -x509 -nodes -days 7300 -key server2.key -outform DER -out $@ -config authorityKeyId_subjectKeyId.conf -extensions 'v3_req_authorityKeyId_no_issuer'
diff --git a/tests/data_files/authorityKeyId_no_keyid.crt.der b/tests/data_files/authorityKeyId_no_keyid.crt.der
index c6d0d7e9869897115c705c46801b28c1334c581b..4ac5f00763d4d6c721d11392ea99ef36dde72208 100644
GIT binary patch
delta 371
zcmeBW?`2muXkzX(Xksc{z|6$R#3YizVsMt-_nH0K1A%J%7n}}l7239IqH?f=nW2fH
zk&&UXVU#$piLrs1fhB~yvF|!#JvL1Sylk9WZ60mkc^MhGSs9p{7#SIIyVmN-zs)}=
z9k;_P>F#m;m1&<EBJcVe)uc^$ac}+O_CRUjb@RNKUgoPmJeYLqaGH18vjq#*<}zBu
zXSKaFG3`;0V^3l>y7TaU;uZ@X;rHdU<@fz7vGS?!(@6K)(4`!s5FVXnK2wz~E~Y=`
zg>#n~Q@#G{os+GXOzJtC`L(91a)~q}_uG|b`8vGD(ykFHk)0cP_AF}uE}tr^IMrCA
zMxEKcrBfwvgVw^Ut7<gd+(Me~XbSBK=JC4q{50pyX?xjHR`+Z_nNV%9p1oJN`HFR8
zZ|8B>q}Rb(rgI-nFX-QY?u+rgnYEj?=<J=mcJ6P%CA%NqcyZJwq)Bw`QtOU6T`yfz
FH34!3n_2(>

delta 371
zcmeBW?`2muXkzX(Xksc{z|6$R#3WMM_~~NCKjWV%AJ)acX!&*dXuQg;iORterUn*<
zhK6PaMp5FtCdLM)2F4KX#=h%}_1H8S@Un4gwRyCC=VfH%W@TV*Vq|0xFwH4nd(fxO
zO2ko7A~`Q3_4y*L)n)CjI>r(nPvQ@07lnK8V)@>G{^cbPi9@Cxt9grbFF)<Ny4lCD
zdfQU1+wNOq*G@h8cg?ZqC+BvTbNov&zM8a4tiq#SbIVFW?uYfOVp-QRpE^3Bb`v9G
z#*8Dm3u{w+8QQ(ncD(z|)fuEC;aX^`zwHIL;pFt@#ZNr>x=SK%pXJlx>wVR!l6@+k
zZ@0+z6|%9%daf>+^3h<2U_(m2hM%T3YvirX^Al~}ZrR>3a|y?-Cb1vlaW~!D+$Xg&
zuXc}I);Ime1+AHXJ!=@;6~x-6ndq%*x+>d#wBdZ0>iOf2Ne_EgS1vuS_{t^yMqOdt
GzMlZ!Zlvx2

diff --git a/tests/data_files/authorityKeyId_subjectKeyId.crt.der b/tests/data_files/authorityKeyId_subjectKeyId.crt.der
index 4186b499eddad9401a12564f52bda63193073a86..a6ca46958f2ac0ddb88b6d2a203fd3e0bb1cf92b 100644
GIT binary patch
delta 293
zcmV+=0owkf2crj&b{94=G%+$VG%+$-7Y#HsFg7qbF)}hVF|myn0)JEo5*U_giLdxN
z32nxYrM@n(cmeQ#sA|~LKc2u^HrC@R_LMr1-~+dt535)3pwMSBdvB;O$GHjJZN!<}
zl{85(HM-F*nF#&v{o=H)Y+XepwQq?pcp^Q8g^k1hm>aLocZX_VV8glgA~dZjsbZ~t
zeeACAAF_{vJyE+emw)g=)Q18L1u^V=nW|y33hfrVaRy3w$~t9;oD?v!O-RK&V?ycy
zV2e4-Ev=-)UA`XxRO85exaoJect(eR^{x1Co5*pw_4qV#NEkiY0J0SN=!n_U{>#Q!
r)2xE(|BjH(Oz6VEBLow_F*nO}qL4=&+P8T9TOI|0K~1N*i2^-{%c6|K

delta 293
zcmV+=0owkf2crj&b{91;I59CXHZU?;7Y#HsFf}kUF)=YVFtLpm0)Lgy0rj-x_L$hF
z8C>e)@Y?cY1G?#!+D|gmG_oA#`WBD5fh{lTd3675DwMzON#Us{rUec9yYU^<DGt1v
z^mA3Y-JnG|EdrQG&61cr`ivsN70#Rm+)>XRYO!Z)q1D^}ui?DR<op6m5QnYWQO&39
zvRT|`F`>YVX5vOa>3{4FprUwWQmJAdW9!`J=(#;jWobOOl|>;A(mZ^Z>inrt;tIp@
zakR*|;h?F@D?Ww#uF=W2Y!T(Ihpsw&>Kf^UHX!WqY+V%G{z7Owaa`@9GpYh%YNTFF
rr><PO9#t=fozO%S#D+PDo|CF*lsNq9qKa)~l4@9c#63nPMFJ#^Mxv9J

diff --git a/tests/suites/test_suite_x509parse.data b/tests/suites/test_suite_x509parse.data
index b49824be8..0b831a9f8 100644
--- a/tests/suites/test_suite_x509parse.data
+++ b/tests/suites/test_suite_x509parse.data
@@ -3319,7 +3319,7 @@ x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_subjectKeyId.crt.der":"
 
 X509 CRT parse Authority Key Id - Correct Authority Key ID (no keyid)
 depends_on:MBEDTLS_MD_CAN_SHA256:MBEDTLS_RSA_C
-x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_no_keyid.crt.der":"":"NL/PolarSSL/PolarSSL Test CA/":"7581F2D168FE33F964F0AE5FE884FAD3C55F24DA":0
+x509_crt_parse_authoritykeyid:"data_files/authorityKeyId_no_keyid.crt.der":"":"NL/PolarSSL/PolarSSL Test CA/":"680430CD074DE63FCDC051260FD042C2B512B6BA":0
 
 X509 CRT parse Authority Key Id - Correct Authority Key ID (no issuer)
 depends_on:MBEDTLS_MD_CAN_SHA256:MBEDTLS_RSA_C