From 284481f7ca080b553cabfb23abf2d6455ee850ad Mon Sep 17 00:00:00 2001
From: Ben Taylor <ben.taylor@linaro.org>
Date: Tue, 14 Oct 2025 11:44:13 +0100
Subject: [PATCH 1/5] Remove lcov.sh as this will be moved to the framework

Signed-off-by: Ben Taylor <ben.taylor@linaro.org>
---
 scripts/lcov.sh | 96 -------------------------------------------------
 1 file changed, 96 deletions(-)
 delete mode 100755 scripts/lcov.sh

diff --git a/scripts/lcov.sh b/scripts/lcov.sh
deleted file mode 100755
index 60fce6cbc2..0000000000
--- a/scripts/lcov.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh
-
-help () {
-    cat <<EOF
-Usage: $0 [-r]
-Collect coverage statistics of library code into an HTML report.
-
-General instructions:
-1. Build the library with CFLAGS="--coverage -O0 -g3" and link the test
-   programs with LDFLAGS="--coverage".
-   This can be an out-of-tree build.
-   For example (in-tree):
-        make CFLAGS="--coverage -O0 -g3" LDFLAGS="--coverage"
-   Or (out-of-tree):
-        mkdir build-coverage && cd build-coverage &&
-        cmake -D CMAKE_BUILD_TYPE=Coverage .. && make
-2. Run whatever tests you want.
-3. Run this script from the parent of the directory containing the library
-   object files and coverage statistics files.
-4. Browse the coverage report in Coverage/index.html.
-5. After rework, run "$0 -r", then re-test and run "$0" to get a fresh report.
-
-Options
-  -r    Reset traces. Run this before re-testing to get fresh measurements.
-EOF
-}
-
-# 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
-
-. framework/scripts/project_detection.sh
-
-# Collect stats and build a HTML report.
-lcov_library_report () {
-    rm -rf Coverage
-    mkdir Coverage Coverage/tmp
-    # Pass absolute paths as lcov output files. This works around a bug
-    # whereby lcov tries to create the output file in the root directory
-    # if it has emitted a warning. A fix was released in lcov 1.13 in 2016.
-    # Ubuntu 16.04 is affected, 18.04 and above are not.
-    # https://github.com/linux-test-project/lcov/commit/632c25a0d1f5e4d2f4fd5b28ce7c8b86d388c91f
-    COVTMP=$PWD/Coverage/tmp
-    lcov --capture --initial ${lcov_dirs} -o "$COVTMP/files.info"
-    lcov --rc lcov_branch_coverage=1 --capture ${lcov_dirs} -o "$COVTMP/tests.info"
-    lcov --rc lcov_branch_coverage=1 --add-tracefile "$COVTMP/files.info" --add-tracefile "$COVTMP/tests.info" -o "$COVTMP/all.info"
-    lcov --rc lcov_branch_coverage=1 --remove "$COVTMP/all.info" -o "$COVTMP/final.info" '*.h'
-    gendesc tests/Descriptions.txt -o "$COVTMP/descriptions"
-    genhtml --title "$title" --description-file "$COVTMP/descriptions" --keep-descriptions --legend --branch-coverage -o Coverage "$COVTMP/final.info"
-    rm -f "$COVTMP/"*.info "$COVTMP/descriptions"
-    echo "Coverage report in: Coverage/index.html"
-}
-
-# Reset the traces to 0.
-lcov_reset_traces () {
-    # Location with plain make
-    for dir in ${library_dirs}; do
-        rm -f ${dir}/*.gcda
-    done
-    # Location with CMake
-    for dir in ${library_dirs}; do
-        rm -f ${dir}/CMakeFiles/*.dir/*.gcda
-    done
-}
-
-if [ $# -gt 0 ] && [ "$1" = "--help" ]; then
-    help
-    exit
-fi
-
-if in_mbedtls_repo; then
-    library_dirs='library tf-psa-crypto/core tf-psa-crypto/drivers/builtin'
-    title='Mbed TLS'
-else
-    library_dirs='core drivers/builtin'
-    title='TF-PSA-Crypto'
-fi
-
-lcov_dirs=""
-for dir in ${library_dirs}; do
-    lcov_dirs="${lcov_dirs} --directory ${dir}"
-done
-
-main=lcov_library_report
-while getopts r OPTLET; do
-    case $OPTLET in
-        r) main=lcov_reset_traces;;
-        *) help 2>&1; exit 120;;
-    esac
-done
-shift $((OPTIND - 1))
-
-"$main" "$@"

From 9b4f222f4f4d54ad2bf1a558f1aa73ecc39fb2a2 Mon Sep 17 00:00:00 2001
From: Ben Taylor <ben.taylor@linaro.org>
Date: Fri, 17 Oct 2025 08:47:52 +0100
Subject: [PATCH 2/5] Update lcov.sh paths in make files

Signed-off-by: Ben Taylor <ben.taylor@linaro.org>
---
 CMakeLists.txt      | 4 ++--
 scripts/legacy.make | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 659fd50885..c59bc7f96c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -489,9 +489,9 @@ if(ENABLE_TESTING)
         # 2. Run the relevant tests for the part of the code you're interested in.
         #    For the reference coverage measurement, see
         #    tests/scripts/basic-build-test.sh
-        # 3. Run scripts/lcov.sh to generate an HTML report.
+        # 3. Run framework/scripts/lcov.sh to generate an HTML report.
         ADD_CUSTOM_TARGET(lcov
-            COMMAND scripts/lcov.sh
+            COMMAND framework/scripts/lcov.sh
         )
 
         ADD_CUSTOM_TARGET(memcheck
diff --git a/scripts/legacy.make b/scripts/legacy.make
index 9c8585cd86..b22b8ef8bf 100644
--- a/scripts/legacy.make
+++ b/scripts/legacy.make
@@ -154,9 +154,9 @@ ifndef WINDOWS
 # 2. Run the relevant tests for the part of the code you're interested in.
 #    For the reference coverage measurement, see
 #    tests/scripts/basic-build-test.sh
-# 3. Run scripts/lcov.sh to generate an HTML report.
+# 3. Run framework/scripts/lcov.sh to generate an HTML report.
 lcov:
-	scripts/lcov.sh
+	framework/scripts/lcov.sh
 
 apidoc:
 	mkdir -p apidoc

From 82a48d42fff027b85cf623cad0ba1e1aa0864358 Mon Sep 17 00:00:00 2001
From: Ben Taylor <ben.taylor@linaro.org>
Date: Tue, 21 Oct 2025 11:17:14 +0100
Subject: [PATCH 3/5] Update lcov.sh patch to use CMake variable

Signed-off-by: Ben Taylor <ben.taylor@linaro.org>
---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c59bc7f96c..49206c12ea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -489,9 +489,9 @@ if(ENABLE_TESTING)
         # 2. Run the relevant tests for the part of the code you're interested in.
         #    For the reference coverage measurement, see
         #    tests/scripts/basic-build-test.sh
-        # 3. Run framework/scripts/lcov.sh to generate an HTML report.
+        # 3. Run ${MBEDTLS_FRAMEWORK_DIR}/scripts/lcov.sh to generate an HTML report.
         ADD_CUSTOM_TARGET(lcov
-            COMMAND framework/scripts/lcov.sh
+            COMMAND ${MBEDTLS_FRAMEWORK_DIR}/scripts/lcov.sh
         )
 
         ADD_CUSTOM_TARGET(memcheck

From 76899ea606fd4e9a07a9c5c27588cd1fdb9e5ae6 Mon Sep 17 00:00:00 2001
From: Ben Taylor <ben.taylor@linaro.org>
Date: Fri, 24 Oct 2025 11:00:01 +0100
Subject: [PATCH 4/5] Update framework module

Signed-off-by: Ben Taylor <ben.taylor@linaro.org>
---
 framework | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework b/framework
index 4579964747..875ec308e7 160000
--- a/framework
+++ b/framework
@@ -1 +1 @@
-Subproject commit 457996474728cb8e968ed21953b72f74d2f536b2
+Subproject commit 875ec308e7ff34610075507b7216172ce8eb0785

From 4b8d9d41ee70d522d837e04f106890407ff5c468 Mon Sep 17 00:00:00 2001
From: Ben Taylor <ben.taylor@linaro.org>
Date: Fri, 31 Oct 2025 14:41:31 +0000
Subject: [PATCH 5/5] Update tf-psa-crypto submodule to include new framework

Signed-off-by: Ben Taylor <ben.taylor@linaro.org>
---
 tf-psa-crypto | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tf-psa-crypto b/tf-psa-crypto
index 609a7064cb..0a7317cc51 160000
--- a/tf-psa-crypto
+++ b/tf-psa-crypto
@@ -1 +1 @@
-Subproject commit 609a7064cbf8b325fe2579476f69d66ffad9d106
+Subproject commit 0a7317cc517bcb8a2505e43f52da6cbc40b7134b