commit 55d97f2ca8f068ef807ad1c9cf2ad8ffb87386b3
author Ronald Cron <ronald.cron@arm.com> Fri Jun 26 17:00:30 2020 +0200
committer Ronald Cron <ronald.cron@arm.com> Thu Jul 02 09:39:30 2020 +0200
tree 4299d6cda881ef816b6caba9ffb650bcc45c0b86
parent ac6ae3515085d633523da3da90fd0c2202365212

tests: Remove usage of mbedtls_test_hexify for comparison

Do not hexify binary data to compare them, do compare
them directly. That simplifies the check code and save
memory.

Signed-off-by: Ronald Cron <ronald.cron@arm.com>

tests/suites/test_suite_poly1305.function

diff --git a/tests/suites/test_suite_poly1305.function b/tests/suites/test_suite_poly1305.function
index 44617d9..0fc1f60 100644
--- a/tests/suites/test_suite_poly1305.function
+++ b/tests/suites/test_suite_poly1305.function
@@ -9,14 +9,12 @@
  */
 
 /* BEGIN_CASE */
-void mbedtls_poly1305( data_t *key, char *hex_mac_string, data_t *src_str )
+void mbedtls_poly1305( data_t *key, data_t *expected_mac, data_t *src_str )
 {
     unsigned char mac[16]; /* size set by the standard */
-    unsigned char mac_str[33]; /* hex expansion of the above */
     mbedtls_poly1305_context ctx;
 
-    memset( mac_str, 0x00, sizeof( mac_str ) );
-    memset( mac,     0x00, sizeof( mac ) );
+    memset( mac, 0x00, sizeof( mac ) );
 
     /*
      * Test the integrated API
@@ -24,8 +22,7 @@
     TEST_ASSERT( mbedtls_poly1305_mac( key->x, src_str->x,
                                        src_str->len, mac ) == 0 );
 
-    mbedtls_test_hexify( mac_str, mac, 16 );
-    TEST_ASSERT( strcmp( (char *) mac_str, hex_mac_string ) == 0 );
+    TEST_ASSERT( !memcmp( mac, expected_mac->x, expected_mac->len ) );
 
     /*
      * Test the streaming API
@@ -38,8 +35,7 @@
 
     TEST_ASSERT( mbedtls_poly1305_finish( &ctx, mac ) == 0 );
 
-    mbedtls_test_hexify( mac_str, mac, 16 );
-    TEST_ASSERT( strcmp( (char *) mac_str, hex_mac_string ) == 0 );
+    TEST_ASSERT( !memcmp( mac, expected_mac->x, expected_mac->len ) );
 
     /*
      * Test the streaming API again, piecewise
@@ -56,8 +52,7 @@
 
         TEST_ASSERT( mbedtls_poly1305_finish( &ctx, mac ) == 0 );
 
-        mbedtls_test_hexify( mac_str, mac, 16 );
-        TEST_ASSERT( strcmp( (char *) mac_str, hex_mac_string ) == 0 );
+        TEST_ASSERT( !memcmp( mac, expected_mac->x, expected_mac->len ) );
     }
 
     /*
@@ -73,8 +68,7 @@
 
         TEST_ASSERT( mbedtls_poly1305_finish( &ctx, mac ) == 0 );
 
-        mbedtls_test_hexify( mac_str, mac, 16 );
-        TEST_ASSERT( strcmp( (char *) mac_str, hex_mac_string ) == 0 );
+        TEST_ASSERT( !memcmp( mac, expected_mac->x, expected_mac->len ) );
     }
 
     mbedtls_poly1305_free( &ctx );