commit 357b297b16973e269925a45c1a9a97f80f705cbf
author toth92g <toth92g@gmail.com> Tue May 04 15:41:35 2021 +0200
committer Przemek Stekiel <przemyslaw.stekiel@mobica.com> Tue Apr 04 17:48:27 2023 +0200
tree ff5a43b9c6bbee4bfe5c984f5cc389d9d06b0110
parent 2d2fb3a5a7508321a4ea64c43ba49ce1bf7c6a24

Correcting tests:
- Wrong condition was checked (ref_ret != 0 instead of ref_ret == 0)
- tags were not checked (nor lengths)
- Using ASSERT_COMPARE where possible

Signed-off-by: toth92g <toth92g@gmail.com>

tests/suites/test_suite_x509parse.function

diff --git a/tests/suites/test_suite_x509parse.function b/tests/suites/test_suite_x509parse.function
index 07ac4cf..5b59be3 100644
--- a/tests/suites/test_suite_x509parse.function
+++ b/tests/suites/test_suite_x509parse.function
@@ -1474,22 +1474,20 @@
 /* END_CASE */
 
 /* BEGIN_CASE depends_on:MBEDTLS_FS_IO:MBEDTLS_X509_CRT_PARSE_C:MBEDTLS_CERTS_C:MBEDTLS_SHA1_C:MBEDTLS_RSA_C */
-void mbedtls_x509_crt_parse_subjectkeyid(data_t *buf,
-                                         char *subjectKeyId,
-                                         int subjectKeyIdLength,
-                                         int retVal)
+void mbedtls_x509_crt_parse_subjectkeyid(data_t *buf, unsigned int subjectKeyIdLength, int ref_ret)
 {
     mbedtls_x509_crt crt;
 
     mbedtls_x509_crt_init(&crt);
 
-    TEST_ASSERT(mbedtls_x509_crt_parse_der(&crt, buf->x, buf->len) == retVal);
+    TEST_ASSERT(mbedtls_x509_crt_parse_der(&crt, buf->x, buf->len) == ref_ret);
 
-    if (retVal != 0) {
-        ASSERT_COMPARE(crt.subject_key_id.p,
-                       (int) crt.subject_key_id.len,
-                       subjectKeyId,
-                       subjectKeyIdLength);
+    if (ref_ret == 0) {
+        TEST_ASSERT(crt.subject_key_id.tag == MBEDTLS_ASN1_OCTET_STRING);
+        TEST_ASSERT(crt.subject_key_id.len == subjectKeyIdLength);
+    } else {
+        TEST_ASSERT(crt.subject_key_id.tag == 0);
+        TEST_ASSERT(crt.subject_key_id.len == 0);
     }
 
 exit:
@@ -1499,28 +1497,24 @@
 
 /* BEGIN_CASE depends_on:MBEDTLS_FS_IO:MBEDTLS_X509_CRT_PARSE_C:MBEDTLS_CERTS_C:MBEDTLS_SHA1_C:MBEDTLS_RSA_C */
 void mbedtls_x509_crt_parse_authoritykeyid(data_t *buf,
-                                           char *authorityKeyId_keyId,
-                                           int keyIdLength,
+                                           unsigned int keyIdLength,
                                            char *authorityKeyId_issuer,
-                                           char *authorityKeyId_serial,
-                                           int serialLength,
-                                           int retVal)
+                                           unsigned int serialLength,
+                                           int ref_ret)
 {
     mbedtls_x509_crt crt;
-    int result = 0;
     int bufferCounter = 0;
     size_t issuerCounter = 0;
+    unsigned int result = 0;
 
     mbedtls_x509_crt_init(&crt);
 
-    TEST_ASSERT(mbedtls_x509_crt_parse_der(&crt, buf->x, buf->len) == retVal);
+    TEST_ASSERT(mbedtls_x509_crt_parse_der(&crt, buf->x, buf->len) == ref_ret);
 
-    if (retVal != 0) {
+    if (ref_ret == 0) {
         /* KeyId test */
-        ASSERT_COMPARE(crt.authority_key_id.keyIdentifier.p,
-                       (int) crt.authority_key_id.keyIdentifier.len,
-                       authorityKeyId_keyId,
-                       keyIdLength);
+        TEST_ASSERT(crt.authority_key_id.keyIdentifier.tag == MBEDTLS_ASN1_OCTET_STRING);
+        TEST_ASSERT(crt.authority_key_id.keyIdentifier.len == keyIdLength);
 
         /* Issuer test */
         mbedtls_x509_name *issuerPtr = &crt.authority_key_id.authorityCertIssuer;
@@ -1532,14 +1526,18 @@
             bufferCounter++; /* Skipping the slash */
             issuerPtr = issuerPtr->next;
         }
+        TEST_ASSERT(result == 0);
 
         /* Serial test */
-        ASSERT_COMPARE(crt.authority_key_id.authorityCertSerialNumber.p,
-                       (int) crt.authority_key_id.authorityCertSerialNumber.len,
-                       authorityKeyId_serial,
-                       serialLength);
+        TEST_ASSERT(crt.authority_key_id.authorityCertSerialNumber.tag ==
+                    MBEDTLS_ASN1_OCTET_STRING);
+        TEST_ASSERT(crt.authority_key_id.authorityCertSerialNumber.len == serialLength);
+    } else {
+        TEST_ASSERT(crt.authority_key_id.keyIdentifier.tag == 0);
+        TEST_ASSERT(crt.authority_key_id.keyIdentifier.len == 0);
 
-        TEST_ASSERT(result == 0);
+        TEST_ASSERT(crt.authority_key_id.authorityCertSerialNumber.tag == 0);
+        TEST_ASSERT(crt.authority_key_id.authorityCertSerialNumber.len == 0);
     }
 
 exit: