Merge pull request #9785 from waleed-elmelegy-arm/add-iop-export-pub-key-setup-abort
Add PSA interruptible export public-key setup & abort APIs
diff --git a/framework b/framework
index f1119c2..df0144c 160000
--- a/framework
+++ b/framework
@@ -1 +1 @@
-Subproject commit f1119c2e80d0a3ce1260fbf3714f5955b4abd026
+Subproject commit df0144c4a3c0fc9beea606afde07cf8708233675
diff --git a/scripts/lcov.sh b/scripts/lcov.sh
index 79c5c9f..60fce6c 100755
--- a/scripts/lcov.sh
+++ b/scripts/lcov.sh
@@ -28,18 +28,11 @@
# Copyright The Mbed TLS Contributors
# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
+# This script must be invoked from the project's root.
+
set -eu
-# Project detection
-PROJECT_NAME_FILE='./scripts/project_name.txt'
-if read -r PROJECT_NAME < "$PROJECT_NAME_FILE"; then :; else
- echo "$PROJECT_NAME_FILE does not exist... Exiting..." >&2
- exit 1
-fi
-
-in_mbedtls_repo () {
- test "$PROJECT_NAME" = "Mbed TLS"
-}
+. framework/scripts/project_detection.sh
# Collect stats and build a HTML report.
lcov_library_report () {
diff --git a/tests/scripts/check-generated-files.sh b/tests/scripts/check-generated-files.sh
index 35990d0..865e247 100755
--- a/tests/scripts/check-generated-files.sh
+++ b/tests/scripts/check-generated-files.sh
@@ -22,13 +22,7 @@
exit
fi
-in_mbedtls_repo () {
- test -d include -a -d library -a -d programs -a -d tests
-}
-
-in_tf_psa_crypto_repo () {
- test -d include -a -d core -a -d drivers -a -d programs -a -d tests
-}
+. framework/scripts/project_detection.sh
if in_mbedtls_repo; then
if [ -d tf-psa-crypto ]; then
diff --git a/tests/scripts/mbedtls-all.sh b/tests/scripts/mbedtls-all.sh
index a1b062a..089cb6b 100755
--- a/tests/scripts/mbedtls-all.sh
+++ b/tests/scripts/mbedtls-all.sh
@@ -10,6 +10,7 @@
# This script must be invoked from the project's root.
-source framework/scripts/all-core.sh
+FRAMEWORK="$PWD/framework"
+source $FRAMEWORK/scripts/all-core.sh
main "$@"
diff --git a/tf-psa-crypto/tests/scripts/all.sh b/tf-psa-crypto/tests/scripts/all.sh
index 86b0609..9c7547b 100755
--- a/tf-psa-crypto/tests/scripts/all.sh
+++ b/tf-psa-crypto/tests/scripts/all.sh
@@ -19,10 +19,12 @@
if [ -d ../include/mbedtls -a -d ../framework ]; then
# Running inside an mbedtls checkout: get the framework from mbedtls.
- source ../framework/scripts/all-core.sh
+ FRAMEWORK="$PWD/../framework"
else
# Running standalone: use our own framework.
- source framework/scripts/all-core.sh
+ FRAMEWORK="$PWD/framework"
fi
+source $FRAMEWORK/scripts/all-core.sh
+
main "$@"