Merge branch 'release/1.6.x'
Merge the changes required for release v1.6.0 back onto the
master branch.
Change-Id: I4756a9af97b546d3bcde4bbcf87da94963e488f9
Signed-off-by: Kevin Peng <kevin.peng@arm.com>
diff --git a/test/bl1/bl1_1/suites/trng/bl1_1_trng_tests.c b/test/bl1/bl1_1/suites/trng/bl1_1_trng_tests.c
index 5d175aa..bf6ff57 100644
--- a/test/bl1/bl1_1/suites/trng/bl1_1_trng_tests.c
+++ b/test/bl1/bl1_1/suites/trng/bl1_1_trng_tests.c
@@ -23,7 +23,7 @@
{
uint8_t buf[TEST_VAL_AM];
size_t buf_idx;
- uint16_t table[UINT8_MAX];
+ uint16_t table[UINT8_MAX + 1];
size_t table_idx;
bool failed = false;
int rc;
@@ -44,7 +44,7 @@
* it is a failure. Note that we can't make this too close to P = 1/256 as
* this would lead to unpredictable failures even with unbiased TRNGs.
*/
- for (table_idx = 0; table_idx < sizeof(table); table_idx++) {
+ for (table_idx = 0; table_idx < (sizeof(table) / sizeof(table[0])); table_idx++) {
if (table[table_idx] >= REPEAT_THRESHOLD) {
TEST_LOG("Byte 0x%x was repeated %d times\r\n", table_idx,
table[table_idx]);
diff --git a/test/secure_fw/common_test_services/tfm_secure_client_2/tfm_secure_client_2.c b/test/secure_fw/common_test_services/tfm_secure_client_2/tfm_secure_client_2.c
index 84ffe1b..5d72291 100644
--- a/test/secure_fw/common_test_services/tfm_secure_client_2/tfm_secure_client_2.c
+++ b/test/secure_fw/common_test_services/tfm_secure_client_2/tfm_secure_client_2.c
@@ -80,7 +80,7 @@
*
* \param[in] msg Pointer to the message of the test function
*/
-static void secure_client_2_test_retrieve_app_mem(psa_msg_t *msg)
+static void secure_client_2_test_retrieve_app_mem(const psa_msg_t *msg)
{
if (msg->out_size[0] != 0) {
/*