commit dcad168acfe3ce9f5cde4914661f1db444ef1faf
author Waleed Elmelegy <waleed.elmelegy@arm.com> Tue Aug 29 14:55:03 2023 +0100
committer Waleed Elmelegy <waleed.elmelegy@arm.com> Mon Sep 04 17:56:39 2023 +0100
tree 6fe08afe68910358e5572188d7a71fc532876f26
parent 7aeb6e76107eddb9c85f9929aee133baac2894e5

Improve mbedtls_pkcs5_pbes2_ext function test data

Signed-off-by: Waleed Elmelegy <waleed.elmelegy@arm.com>

tests/suites/test_suite_pkcs5.function

diff --git a/tests/suites/test_suite_pkcs5.function b/tests/suites/test_suite_pkcs5.function
index f675f66..7b7b7db 100644
--- a/tests/suites/test_suite_pkcs5.function
+++ b/tests/suites/test_suite_pkcs5.function
@@ -36,7 +36,7 @@
 /* BEGIN_CASE depends_on:MBEDTLS_ASN1_PARSE_C */
 void pbes2_encrypt(int params_tag, data_t *params_hex, data_t *pw,
                    data_t *data, int outsize, int ref_ret,
-                   data_t *ref_out, int ref_out_len)
+                   data_t *ref_out)
 {
     int my_ret;
     mbedtls_asn1_buf params;
@@ -46,7 +46,6 @@
 #endif
 
     /* Those parameters are only used when MBEDTLS_CIPHER_PADDING_PKCS7 is enabled */
-    (void) ref_out_len;
     (void) outsize;
 
     params.tag = params_tag;
@@ -55,9 +54,9 @@
 
     ASSERT_ALLOC(my_out, ref_out->len);
 
-    my_ret = mbedtls_pkcs5_pbes2(&params, MBEDTLS_PKCS5_ENCRYPT,
-                                 pw->x, pw->len, data->x, data->len, my_out);
     if (ref_ret != MBEDTLS_ERR_ASN1_BUF_TOO_SMALL) {
+        my_ret = mbedtls_pkcs5_pbes2(&params, MBEDTLS_PKCS5_ENCRYPT,
+                                     pw->x, pw->len, data->x, data->len, my_out);
         TEST_EQUAL(my_ret, ref_ret);
     }
     if (ref_ret == 0) {
@@ -72,7 +71,7 @@
     TEST_EQUAL(my_ret, ref_ret);
     if (ref_ret == 0) {
         ASSERT_COMPARE(my_out, my_out_len,
-                       ref_out->x, ref_out_len);
+                       ref_out->x, ref_out->len);
     }
 #endif
 
@@ -82,9 +81,9 @@
 /* END_CASE */
 
 /* BEGIN_CASE depends_on:MBEDTLS_ASN1_PARSE_C */
-void mbedtls_pkcs5_pbes2(int params_tag, data_t *params_hex, data_t *pw,
-                         data_t *data, int outsize, int ref_ret,
-                         data_t *ref_out, int ref_out_len)
+void pbes2_decrypt(int params_tag, data_t *params_hex, data_t *pw,
+                   data_t *data, int outsize, int ref_ret,
+                   data_t *ref_out)
 {
     int my_ret;
     mbedtls_asn1_buf params;
@@ -94,19 +93,17 @@
 #endif
 
     /* Those parameters are only used when MBEDTLS_CIPHER_PADDING_PKCS7 is enabled */
-    (void) ref_out_len;
     (void) outsize;
 
-
     params.tag = params_tag;
     params.p = params_hex->x;
     params.len = params_hex->len;
 
     ASSERT_ALLOC(my_out, ref_out->len);
 
-    my_ret = mbedtls_pkcs5_pbes2(&params, MBEDTLS_PKCS5_DECRYPT,
-                                 pw->x, pw->len, data->x, data->len, my_out);
     if (ref_ret != MBEDTLS_ERR_ASN1_BUF_TOO_SMALL) {
+        my_ret = mbedtls_pkcs5_pbes2(&params, MBEDTLS_PKCS5_DECRYPT,
+                                     pw->x, pw->len, data->x, data->len, my_out);
         TEST_EQUAL(my_ret, ref_ret);
     }
     if (ref_ret == 0) {
@@ -120,7 +117,7 @@
     TEST_EQUAL(my_ret, ref_ret);
     if (ref_ret == 0) {
         ASSERT_COMPARE(my_out, my_out_len,
-                       ref_out->x, ref_out_len);
+                       ref_out->x, ref_out->len);
     }
 #endif