commit 3e80b1a6576a89d4e4cd77668e1af98e317d6148
author Andrzej Kurek <andrzej.kurek@arm.com> Mon Dec 07 07:01:22 2020 -0500
committer Andrzej Kurek <andrzej.kurek@arm.com> Mon Dec 07 08:54:50 2020 -0500
tree 78d885d6b32fb02a9a6876b5a80523245c161ca4
parent bef771bf50da546540f4b441ced8a18329f198ee

Fix compilation errors when building sign_with_k test function

Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>

tests/scripts/all.sh

diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
index a8747c2..a770f6d 100755
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@@ -1765,7 +1765,7 @@
     scripts/config.pl unset MBEDTLS_ECP_DP_SECP192K1_ENABLED
     scripts/config.pl unset MBEDTLS_ECP_DP_SECP224K1_ENABLED
     scripts/config.pl unset MBEDTLS_ECP_DP_SECP256K1_ENABLED
-    make CC=gcc CFLAGS='-Werror -Wall -Wextra'
+    make CC=gcc CFLAGS='-Werror -Wall -Wextra -DENABLE_TESTS'
 
     msg "test: default config with tinycrypt enabled and legacy ECC disabled"
     make test
@@ -1813,7 +1813,7 @@
     scripts/config.pl unset MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED
     scripts/config.pl unset MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
     scripts/config.pl unset MBEDTLS_X509_RSASSA_PSS_SUPPORT
-    make CFLAGS='-Werror -O1'
+    make CFLAGS='-Werror -O1 -DENABLE_TESTS'
 
     msg "test: default config + single PK type harcoded (tinycrypt)"
     make test

tests/suites/test_suite_tinycrypt.function

diff --git a/tests/suites/test_suite_tinycrypt.function b/tests/suites/test_suite_tinycrypt.function
index 91d29bf..ac34929 100644
--- a/tests/suites/test_suite_tinycrypt.function
+++ b/tests/suites/test_suite_tinycrypt.function
@@ -60,7 +60,6 @@
 /* BEGIN_CASE depends_on:MBEDTLS_USE_TINYCRYPT */
 void ecdh_primitive_vector( data_t * qx_str, data_t * qy_str,
                             data_t * d_str, data_t * z_str )
-
 {
     uint8_t public[2*NUM_ECC_BYTES] = {0};
     uint8_t private[NUM_ECC_BYTES] = {0};
@@ -138,7 +137,7 @@
         k[i] = k_str->x[NUM_ECC_BYTES - i - 1];
     }
     TEST_ASSERT( mbedtls_sha256_ret( message->x, message->len, hash, 0 ) == 0 );
-    TEST_ASSERT( uECC_sign_with_k( d_str->x, hash, sizeof(hash), k,
+    TEST_ASSERT( uECC_sign_with_k( d_str->x, hash, sizeof(hash), (uECC_word_t*) k,
                                    sig_bytes ) == UECC_SUCCESS );
     TEST_ASSERT( memcmp( sig_bytes, r_str->x, NUM_ECC_BYTES) == 0 );
     TEST_ASSERT( memcmp( sig_bytes + NUM_ECC_BYTES, s_str->x, NUM_ECC_BYTES ) == 0 );