aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorHåkon Øye Amundsen <haakon.amundsen@nordicsemi.no>2021-01-19 15:32:15 +0100
committerHåkon Øye Amundsen <haakon.amundsen@nordicsemi.no>2021-02-03 21:29:11 +0100
commit82f9695a6decc8d6f9bb03db53b0409b627fca85 (patch)
tree32440377931a12fea3979a464e329a6e7ad191d2 /lib
parent112e48dbc4e69c900490811d258c566e97e8f82f (diff)
downloadtrusted-firmware-m-82f9695a6decc8d6f9bb03db53b0409b627fca85.tar.gz
Crypto: add patch to fix compilation error
When MBEDTLS_MD_C is not set Change-Id: Ia41928e85ddd3c946d47d3dfa2d7059f884881ed Signed-off-by: Håkon Øye Amundsen <haakon.amundsen@nordicsemi.no>
Diffstat (limited to 'lib')
-rw-r--r--lib/ext/mbedcrypto/0006-Move-misplaced-else-within-ifdef-to-avoid-compilatio.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/lib/ext/mbedcrypto/0006-Move-misplaced-else-within-ifdef-to-avoid-compilatio.patch b/lib/ext/mbedcrypto/0006-Move-misplaced-else-within-ifdef-to-avoid-compilatio.patch
new file mode 100644
index 000000000..159e32504
--- /dev/null
+++ b/lib/ext/mbedcrypto/0006-Move-misplaced-else-within-ifdef-to-avoid-compilatio.patch
@@ -0,0 +1,34 @@
+From 8b2dc6377637c6c146ab5d23a4e119e3d508156c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?H=C3=A5kon=20=C3=98ye=20Amundsen?=
+ <haakon.amundsen@nordicsemi.no>
+Date: Tue, 19 Jan 2021 15:16:55 +0100
+Subject: [PATCH] Move misplaced 'else' within #ifdef to avoid compilation
+ error
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+... when MBEDTLS_MD_C is not defined.
+
+Signed-off-by: Håkon Øye Amundsen <haakon.amundsen@nordicsemi.no>
+---
+ library/psa_crypto.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/library/psa_crypto.c b/library/psa_crypto.c
+index bffddc995..8b1201461 100644
+--- a/library/psa_crypto.c
++++ b/library/psa_crypto.c
+@@ -5220,8 +5220,8 @@ static psa_status_t psa_key_derivation_setup_kdf(
+ operation->capacity = 255 * hash_size;
+ return( PSA_SUCCESS );
+ }
+-#endif /* MBEDTLS_MD_C */
+ else
++#endif /* MBEDTLS_MD_C */
+ return( PSA_ERROR_NOT_SUPPORTED );
+ }
+
+--
+2.30.0
+