commit e3cdf284b2673e5f345b018bc414e58bb2fcc58f
author Jaeden Amero <jaeden.amero@arm.com> Tue Aug 20 12:58:20 2019 +0100
committer Jaeden Amero <jaeden.amero@arm.com> Wed Aug 28 17:24:27 2019 +0100
tree 0dc5af3b94bf37a511f9af946c00b59aac51e9f0
parent 39f03fcf1a4d840b27f0cbf8389c2b70beb1c4f4

psa: Adapt set_key_id() for when owner is included

include/psa/crypto_struct.h

diff --git a/include/psa/crypto_struct.h b/include/psa/crypto_struct.h
index 5296202..804bd34 100644
--- a/include/psa/crypto_struct.h
+++ b/include/psa/crypto_struct.h
@@ -422,7 +422,14 @@
 {
     attributes->core.lifetime = lifetime;
     if( lifetime == PSA_KEY_LIFETIME_VOLATILE )
+    {
+#ifdef MBEDTLS_PSA_CRYPTO_KEY_FILE_ID_ENCODES_OWNER
+        attributes->core.id.key_id = 0;
+        attributes->core.id.owner = 0;
+#else
         attributes->core.id = 0;
+#endif
+    }
 }
 
 static inline psa_key_lifetime_t psa_get_key_lifetime(