diff --git a/tests/suites/test_suite_x509parse_ocsp.data b/tests/suites/test_suite_x509parse_ocsp.data
index a54d48eeab..6c5cb0da62 100644
--- a/tests/suites/test_suite_x509parse_ocsp.data
+++ b/tests/suites/test_suite_x509parse_ocsp.data
@@ -170,7 +170,7 @@ X509 OCSP Response ASN1 (Valid SingleExtensions tag, length larger than data)
 x509parse_ocsp_response:"3082011B0A0100A08201143082011006092B0601050507300101048201013081FE3081FBA16F306D310B300906035504061302554B3110300E06035504080C07456E676C616E643112301006035504070C0943616D6272696467653111300F060355040A0C086D62656420544C53310C300A060355040B0C034953473117301506035504030C0E6C6F63616C686F73743A34343535180F32303137313130373231323734385A30773075303B300906052B0E03021A050004148ECC98CE8B65772CFD7A5DEB5F16D6D233399265041433A4DCFA2567B1E45BBF6100B78BF74AF4639FDE020210018000180F32303137313130373231323734385AA1243021301F06092B060105050730010204120410CCDA35D522E02E86EE7FEE580A9B1EDF":"":MBEDTLS_ERR_X509_INVALID_FORMAT + MBEDTLS_ERR_ASN1_OUT_OF_DATA
 
 X509 OCSP Response ASN1 (Valid nextUpdate, invalid SingleExtensions)
-x509parse_ocsp_response:"3082011B0A0100A08201143082011006092B0601050507300101048201013081FE3081FBA16F306D310B300906035504061302554B3110300E06035504080C07456E676C616E643112301006035504070C0943616D6272696467653111300F060355040A0C086D62656420544C53310C300A060355040B0C034953473117301506035504030C0E6C6F63616C686F73743A34343535180F32303137313130373231323734385A30773075303B300906052B0E03021A050004148ECC98CE8B65772CFD7A5DEB5F16D6D233399265041433A4DCFA2567B1E45BBF6100B78BF74AF4639FDE020210018000180F32303137313130373231323734385AA011180F32303137313130373231323734385A000000000000000000000000000000000000":"":MBEDTLS_ERR_X509_INVALID_FORMAT+MBEDTLS_ERR_ASN1_UNEXPECTED_TAG
+x509parse_ocsp_response:"3082011B0A0100A08201143082011006092B0601050507300101048201013081FE3081FBA16F306D310B300906035504061302554B3110300E06035504080C07456E676C616E643112301006035504070C0943616D6272696467653111300F060355040A0C086D62656420544C53310C300A060355040B0C034953473117301506035504030C0E6C6F63616C686F73743A34343535180F32303137313130373231323734385A30773075303B300906052B0E03021A050004148ECC98CE8B65772CFD7A5DEB5F16D6D233399265041433A4DCFA2567B1E45BBF6100B78BF74AF4639FDE020210018000180F32303137313130373231323734385AA011180F32303137313130373231323734385A000000000000000000000000000000000000":"":MBEDTLS_ERR_X509_INVALID_FORMAT + MBEDTLS_ERR_ASN1_UNEXPECTED_TAG
 
 X509 OCSP Response ASN1 (Valid nextUpdate, correct SingleExtensions tag, length shorter than data)
 x509parse_ocsp_response:"3082011B0A0100A08201143082011006092B0601050507300101048201013081FE3081FBA16F306D310B300906035504061302554B3110300E06035504080C07456E676C616E643112301006035504070C0943616D6272696467653111300F060355040A0C086D62656420544C53310C300A060355040B0C034953473117301506035504030C0E6C6F63616C686F73743A34343535180F32303137313130373231323734385A30773075303B300906052B0E03021A050004148ECC98CE8B65772CFD7A5DEB5F16D6D233399265041433A4DCFA2567B1E45BBF6100B78BF74AF4639FDE020210018000180F32303137313130373231323734385AA011180F32303137313130373231323734385AA10000000000000000000000000000000000":"":MBEDTLS_ERR_X509_INVALID_FORMAT + MBEDTLS_ERR_ASN1_OUT_OF_DATA
@@ -179,22 +179,22 @@ X509 OCSP Response ASN1 (Valid nextUpdate, correct first SingleExtensions tag an
 x509parse_ocsp_response:"3082011B0A0100A08201143082011006092B0601050507300101048201013081FE3081FBA16F306D310B300906035504061302554B3110300E06035504080C07456E676C616E643112301006035504070C0943616D6272696467653111300F060355040A0C086D62656420544C53310C300A060355040B0C034953473117301506035504030C0E6C6F63616C686F73743A34343535180F32303137313130373231323734385A30773075303B300906052B0E03021A050004148ECC98CE8B65772CFD7A5DEB5F16D6D233399265041433A4DCFA2567B1E45BBF6100B78BF74AF4639FDE020210018000180F32303137313130373231323734385AA011180F32303137313130373231323734385AA11000000000000000000000000000000000":"":MBEDTLS_ERR_X509_INVALID_FORMAT + MBEDTLS_ERR_ASN1_UNEXPECTED_TAG
 
 X509 OCSP Response ASN1 (Invalid revocationReason tag)
-x509parse_ocsp_response:"3082011B0A0100A08201143082011006092B0601050507300101048201013081FE3081FBA16F306D310B300906035504061302554B3110300E06035504080C07456E676C616E643112301006035504070C0943616D6272696467653111300F060355040A0C086D62656420544C53310C300A060355040B0C034953473117301506035504030C0E6C6F63616C686F73743A34343535180F32303137313130373231323734385A30773075303B300906052B0E03021A050004148ECC98CE8B65772CFD7A5DEB5F16D6D233399265041433A4DCFA2567B1E45BBF6100B78BF74AF4639FDE02021001A112180F32303137313130373231323734385AA1180F32303137313130373231323734385AA1233021301F06090000000000000000000000":"":MBEDTLS_ERR_X509_INVALID_FORMAT+MBEDTLS_ERR_ASN1_UNEXPECTED_TAG
+x509parse_ocsp_response:"3082011B0A0100A08201143082011006092B0601050507300101048201013081FE3081FBA16F306D310B300906035504061302554B3110300E06035504080C07456E676C616E643112301006035504070C0943616D6272696467653111300F060355040A0C086D62656420544C53310C300A060355040B0C034953473117301506035504030C0E6C6F63616C686F73743A34343535180F32303137313130373231323734385A30773075303B300906052B0E03021A050004148ECC98CE8B65772CFD7A5DEB5F16D6D233399265041433A4DCFA2567B1E45BBF6100B78BF74AF4639FDE02021001A112180F32303137313130373231323734385AA1180F32303137313130373231323734385AA1233021301F06090000000000000000000000":"":MBEDTLS_ERR_X509_INVALID_FORMAT + MBEDTLS_ERR_ASN1_UNEXPECTED_TAG
 
 X509 OCSP Response ASN1 (RevokedInfo correct tag, length larger than data)
-x509parse_ocsp_response:"3082011B0A0100A08201143082011006092B0601050507300101048201013081FE3081FBA16F306D310B300906035504061302554B3110300E06035504080C07456E676C616E643112301006035504070C0943616D6272696467653111300F060355040A0C086D62656420544C53310C300A060355040B0C034953473117301506035504030C0E6C6F63616C686F73743A34343535180F32303137313130373231323734385A30773075303B300906052B0E03021A050004148ECC98CE8B65772CFD7A5DEB5F16D6D233399265041433A4DCFA2567B1E45BBF6100B78BF74AF4639FDE02021001A117180F32303137313130373231323734385AA0030A0100180F32303137313130373231323734385AA1233021301F060900000000000000":"":MBEDTLS_ERR_X509_INVALID_FORMAT+MBEDTLS_ERR_ASN1_LENGTH_MISMATCH
+x509parse_ocsp_response:"3082011B0A0100A08201143082011006092B0601050507300101048201013081FE3081FBA16F306D310B300906035504061302554B3110300E06035504080C07456E676C616E643112301006035504070C0943616D6272696467653111300F060355040A0C086D62656420544C53310C300A060355040B0C034953473117301506035504030C0E6C6F63616C686F73743A34343535180F32303137313130373231323734385A30773075303B300906052B0E03021A050004148ECC98CE8B65772CFD7A5DEB5F16D6D233399265041433A4DCFA2567B1E45BBF6100B78BF74AF4639FDE02021001A117180F32303137313130373231323734385AA0030A0100180F32303137313130373231323734385AA1233021301F060900000000000000":"":MBEDTLS_ERR_X509_INVALID_FORMAT + MBEDTLS_ERR_ASN1_LENGTH_MISMATCH
 
 X509 OCSP Response ASN1 (Incorrect revocationReason tag)
-x509parse_ocsp_response:"3082011B0A0100A08201143082011006092B0601050507300101048201013081FE3081FBA16F306D310B300906035504061302554B3110300E06035504080C07456E676C616E643112301006035504070C0943616D6272696467653111300F060355040A0C086D62656420544C53310C300A060355040B0C034953473117301506035504030C0E6C6F63616C686F73743A34343535180F32303137313130373231323734385A30773075303B300906052B0E03021A050004148ECC98CE8B65772CFD7A5DEB5F16D6D233399265041433A4DCFA2567B1E45BBF6100B78BF74AF4639FDE02021001A116180F32303137313130373231323734385AAB030A0100180F32303137313130373231323734385AA1233021301F060900000000000000":"":MBEDTLS_ERR_X509_INVALID_FORMAT+MBEDTLS_ERR_ASN1_UNEXPECTED_TAG
+x509parse_ocsp_response:"3082011B0A0100A08201143082011006092B0601050507300101048201013081FE3081FBA16F306D310B300906035504061302554B3110300E06035504080C07456E676C616E643112301006035504070C0943616D6272696467653111300F060355040A0C086D62656420544C53310C300A060355040B0C034953473117301506035504030C0E6C6F63616C686F73743A34343535180F32303137313130373231323734385A30773075303B300906052B0E03021A050004148ECC98CE8B65772CFD7A5DEB5F16D6D233399265041433A4DCFA2567B1E45BBF6100B78BF74AF4639FDE02021001A116180F32303137313130373231323734385AAB030A0100180F32303137313130373231323734385AA1233021301F060900000000000000":"":MBEDTLS_ERR_X509_INVALID_FORMAT + MBEDTLS_ERR_ASN1_UNEXPECTED_TAG
 
 X509 OCSP Response ASN1 (revocationReason correct tag, length larger than data)
-x509parse_ocsp_response:"3082011B0A0100A08201143082011006092B0601050507300101048201013081FE3081FBA16F306D310B300906035504061302554B3110300E06035504080C07456E676C616E643112301006035504070C0943616D6272696467653111300F060355040A0C086D62656420544C53310C300A060355040B0C034953473117301506035504030C0E6C6F63616C686F73743A34343535180F32303137313130373231323734385A30773075303B300906052B0E03021A050004148ECC98CE8B65772CFD7A5DEB5F16D6D233399265041433A4DCFA2567B1E45BBF6100B78BF74AF4639FDE02021001A116180F32303137313130373231323734385AA0040A0100180F32303137313130373231323734385AA1233021301F060900000000000000":"":MBEDTLS_ERR_X509_INVALID_FORMAT+MBEDTLS_ERR_ASN1_OUT_OF_DATA
+x509parse_ocsp_response:"3082011B0A0100A08201143082011006092B0601050507300101048201013081FE3081FBA16F306D310B300906035504061302554B3110300E06035504080C07456E676C616E643112301006035504070C0943616D6272696467653111300F060355040A0C086D62656420544C53310C300A060355040B0C034953473117301506035504030C0E6C6F63616C686F73743A34343535180F32303137313130373231323734385A30773075303B300906052B0E03021A050004148ECC98CE8B65772CFD7A5DEB5F16D6D233399265041433A4DCFA2567B1E45BBF6100B78BF74AF4639FDE02021001A116180F32303137313130373231323734385AA0040A0100180F32303137313130373231323734385AA1233021301F060900000000000000":"":MBEDTLS_ERR_X509_INVALID_FORMAT + MBEDTLS_ERR_ASN1_OUT_OF_DATA
 
 X509 OCSP Response ASN1 (revocationReason correct first tag, incorrect second tag)
-x509parse_ocsp_response:"3082011B0A0100A08201143082011006092B0601050507300101048201013081FE3081FBA16F306D310B300906035504061302554B3110300E06035504080C07456E676C616E643112301006035504070C0943616D6272696467653111300F060355040A0C086D62656420544C53310C300A060355040B0C034953473117301506035504030C0E6C6F63616C686F73743A34343535180F32303137313130373231323734385A30773075303B300906052B0E03021A050004148ECC98CE8B65772CFD7A5DEB5F16D6D233399265041433A4DCFA2567B1E45BBF6100B78BF74AF4639FDE02021001A116180F32303137313130373231323734385AA0030B0100180F32303137313130373231323734385AA1233021301F060900000000000000":"":MBEDTLS_ERR_X509_INVALID_FORMAT+MBEDTLS_ERR_ASN1_UNEXPECTED_TAG
+x509parse_ocsp_response:"3082011B0A0100A08201143082011006092B0601050507300101048201013081FE3081FBA16F306D310B300906035504061302554B3110300E06035504080C07456E676C616E643112301006035504070C0943616D6272696467653111300F060355040A0C086D62656420544C53310C300A060355040B0C034953473117301506035504030C0E6C6F63616C686F73743A34343535180F32303137313130373231323734385A30773075303B300906052B0E03021A050004148ECC98CE8B65772CFD7A5DEB5F16D6D233399265041433A4DCFA2567B1E45BBF6100B78BF74AF4639FDE02021001A116180F32303137313130373231323734385AA0030B0100180F32303137313130373231323734385AA1233021301F060900000000000000":"":MBEDTLS_ERR_X509_INVALID_FORMAT + MBEDTLS_ERR_ASN1_UNEXPECTED_TAG
 
 X509 OCSP Response ASN1 (Incorrect CRLReason length)
-x509parse_ocsp_response:"3082011B0A0100A08201143082011006092B0601050507300101048201013081FE3081FBA16F306D310B300906035504061302554B3110300E06035504080C07456E676C616E643112301006035504070C0943616D6272696467653111300F060355040A0C086D62656420544C53310C300A060355040B0C034953473117301506035504030C0E6C6F63616C686F73743A34343535180F32303137313130373231323734385A30773075303B300906052B0E03021A050004148ECC98CE8B65772CFD7A5DEB5F16D6D233399265041433A4DCFA2567B1E45BBF6100B78BF74AF4639FDE02021001A116180F32303137313130373231323734385AA0030A0200180F32303137313130373231323734385AA1233021301F060900000000000000":"":MBEDTLS_ERR_X509_INVALID_FORMAT+MBEDTLS_ERR_ASN1_OUT_OF_DATA
+x509parse_ocsp_response:"3082011B0A0100A08201143082011006092B0601050507300101048201013081FE3081FBA16F306D310B300906035504061302554B3110300E06035504080C07456E676C616E643112301006035504070C0943616D6272696467653111300F060355040A0C086D62656420544C53310C300A060355040B0C034953473117301506035504030C0E6C6F63616C686F73743A34343535180F32303137313130373231323734385A30773075303B300906052B0E03021A050004148ECC98CE8B65772CFD7A5DEB5F16D6D233399265041433A4DCFA2567B1E45BBF6100B78BF74AF4639FDE02021001A116180F32303137313130373231323734385AA0030A0200180F32303137313130373231323734385AA1233021301F060900000000000000":"":MBEDTLS_ERR_X509_INVALID_FORMAT + MBEDTLS_ERR_ASN1_OUT_OF_DATA
 
 X509 OCSP Response ASN1 (Incorrect CRLReason enumerated value)
 x509parse_ocsp_response:"3082011B0A0100A08201143082011006092B0601050507300101048201013081FE3081FBA16F306D310B300906035504061302554B3110300E06035504080C07456E676C616E643112301006035504070C0943616D6272696467653111300F060355040A0C086D62656420544C53310C300A060355040B0C034953473117301506035504030C0E6C6F63616C686F73743A34343535180F32303137313130373231323734385A30773075303B300906052B0E03021A050004148ECC98CE8B65772CFD7A5DEB5F16D6D233399265041433A4DCFA2567B1E45BBF6100B78BF74AF4639FDE02021001A116180F32303137313130373231323734385AA0030A0188180F32303137313130373231323734385AA1233021301F060900000000000000":"":MBEDTLS_ERR_X509_INVALID_CRL_REASON