diff --git a/ChangeLog.d/psa_util_in_builds_without_psa.txt b/ChangeLog.d/psa_util_in_builds_without_psa.txt
new file mode 100644
index 0000000..7c0866d
--- /dev/null
+++ b/ChangeLog.d/psa_util_in_builds_without_psa.txt
@@ -0,0 +1,5 @@
+Bugfix
+   * When MBEDTLS_PSA_CRYPTO_C was disabled and MBEDTLS_ECDSA_C enabled,
+     some code was defining 0-size arrays, resulting in compilation errors.
+     Fixed by disabling the offending code in configurations without PSA
+     Crypto, where it never worked. Fixes #9311.
diff --git a/framework b/framework
index 6a1dc7d..94599c0 160000
--- a/framework
+++ b/framework
@@ -1 +1 @@
-Subproject commit 6a1dc7daa9e861fb873dd4b9f13ebfbd6f82f6dc
+Subproject commit 94599c0e3b5036e086446a51a3f79640f70f22f6