commit 0ad1006606af403b63de5d625857da009bd510b6
author Przemek Stekiel <przemyslaw.stekiel@mobica.com> Thu Apr 06 11:11:58 2023 +0200
committer Przemek Stekiel <przemyslaw.stekiel@mobica.com> Wed Jun 07 09:01:29 2023 +0200
tree 548d1ec78a33d3c002a98a33e5c91a38933cf95b
parent 2568d479165a9f3124caf1be1c990628f377dd68

Check values in tests

Signed-off-by: Przemek Stekiel <przemyslaw.stekiel@mobica.com>

tests/suites/test_suite_x509parse.function

diff --git a/tests/suites/test_suite_x509parse.function b/tests/suites/test_suite_x509parse.function
index bea4722..89155e9 100644
--- a/tests/suites/test_suite_x509parse.function
+++ b/tests/suites/test_suite_x509parse.function
@@ -1550,7 +1550,7 @@
 /* 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 @@
 
     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 @@
 
 /* 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 @@
     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 @@
         /* 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);