psa arch test v1.3 release candidate 1
diff --git a/api-tests/val/common/val.h b/api-tests/val/common/val.h
index 1fb6266..88bab7b 100644
--- a/api-tests/val/common/val.h
+++ b/api-tests/val/common/val.h
@@ -1,5 +1,5 @@
/** @file
- * Copyright (c) 2018-2020, Arm Limited or its affiliates. All rights reserved.
+ * Copyright (c) 2018-2021, Arm Limited or its affiliates. All rights reserved.
* SPDX-License-Identifier : Apache-2.0
*
* Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/api-tests/val/nspe/val_crypto.h b/api-tests/val/nspe/val_crypto.h
index a11369b..a3414ee 100644
--- a/api-tests/val/nspe/val_crypto.h
+++ b/api-tests/val/nspe/val_crypto.h
@@ -55,7 +55,6 @@
#define PSA_ALG_NONE ((psa_algorithm_t)0)
#define PSA_KEY_ID_NULL ((psa_key_id_t)0)
-
#if 0
#define PSA_ALG_AEAD_WITH_DEFAULT_LENGTH_TAG(aead_alg) \
((((aead_alg) & ~0x003f0000) == 0x05400100) ? PSA_ALG_CCM : \
@@ -67,7 +66,6 @@
((psa_algorithm_t) (((aead_alg) & ~0x003f0000) | (((tag_length) & 0x3f) << 16)))
#endif
-
enum crypto_function_code {
VAL_CRYPTO_AEAD_ABORT = 0x1,
VAL_CRYPTO_AEAD_DECRYPT,
diff --git a/api-tests/val/nspe/val_dispatcher.c b/api-tests/val/nspe/val_dispatcher.c
index 57de976..13a3671 100644
--- a/api-tests/val/nspe/val_dispatcher.c
+++ b/api-tests/val/nspe/val_dispatcher.c
@@ -229,6 +229,10 @@
val_print(PRINT_ALWAYS, "\nRunning.. ", 0);
val_print(PRINT_ALWAYS, val_get_comp_name(test_id), 0);
// val_print_api_version();
+#ifdef TESTS_COVERAGE
+ val_print(PRINT_ALWAYS, "\nNOTE : Known failing tests are excluded from this \
+build. For PSA functional API certification, all tests must be run.\n", 0);
+#endif
val_print(PRINT_ALWAYS, "\n******************************************\n", 0);
}
diff --git a/api-tests/val/nspe/val_entry.h b/api-tests/val/nspe/val_entry.h
index ba333ef..79646b9 100644
--- a/api-tests/val/nspe/val_entry.h
+++ b/api-tests/val/nspe/val_entry.h
@@ -21,7 +21,7 @@
#include "val_framework.h"
#define PSA_ACS_MAJOR_VER 1
-#define PSA_ACS_MINOR_VER 2
+#define PSA_ACS_MINOR_VER 3
/**
@brief - PSA Test Suite C main function, does VAL init and calls test dispatcher
diff --git a/api-tests/val/nspe/val_peripherals.c b/api-tests/val/nspe/val_peripherals.c
index 4e2d31b..4424639 100644
--- a/api-tests/val/nspe/val_peripherals.c
+++ b/api-tests/val/nspe/val_peripherals.c
@@ -157,8 +157,6 @@
val_status_t val_wd_reprogram_timer(wd_timeout_type_t timeout_type)
{
val_status_t status = VAL_STATUS_SUCCESS;
-
- (void)timeout_type; // Argument unused if WATCHDOG_AVAILABLE is not defined
#ifdef WATCHDOG_AVAILABLE
/* Disable watchdog Timer */
val_wd_timer_disable();
@@ -176,6 +174,8 @@
{
return status;
}
+#else
+ (void)timeout_type; // Argument unused if WATCHDOG_AVAILABLE is not defined
#endif
return status;