commit c6350948d29e6538d99f01f32d27ca5d129abc0c
author Julian Hall <julian.hall@arm.com> Wed Jul 21 12:08:09 2021 +0100
committer Gyorgy Szing <Gyorgy.Szing@arm.com> Wed Oct 06 00:48:31 2021 +0200
tree e28a1b17a1c48aa22a003d930672fe3f2aed2245
parent a6d3cbc2c26ef95d89ebebdf5926828bb3444c71

Remove dependencies on deprecated PSA Crypto API definitions

In preparation for moving to mbedtls-3.0.0 where legacy support is
removed, dependencies on deprecated API functions and defines are
modified to align as closely as possible with PSA Crypto API 1.0.

Signed-off-by: Julian Hall <julian.hall@arm.com>
Change-Id: I9f6fc833336a883382229c430ea71122bd550bd8

protocols/service/crypto/packed-c/key_attributes.h

diff --git a/protocols/service/crypto/packed-c/key_attributes.h b/protocols/service/crypto/packed-c/key_attributes.h
index 473813b..dd1944d 100644
--- a/protocols/service/crypto/packed-c/key_attributes.h
+++ b/protocols/service/crypto/packed-c/key_attributes.h
@@ -16,7 +16,6 @@
 #define TS_CRYPTO_KEY_TYPE_AES                    (0x2400)
 #define TS_CRYPTO_KEY_TYPE_DES                    (0x2301)
 #define TS_CRYPTO_KEY_TYPE_CAMELLIA               (0x2403)
-#define TS_CRYPTO_KEY_TYPE_ARC4                   (0x2002)
 #define TS_CRYPTO_KEY_TYPE_CHACHA20               (0x2004)
 #define TS_CRYPTO_KEY_TYPE_RSA_PUBLIC_KEY         (0x4001)
 #define TS_CRYPTO_KEY_TYPE_RSA_KEY_PAIR           (0x7001)
@@ -38,8 +37,6 @@
 
 /* Crypto algorithms */
 #define TS_CRYPTO_ALG_NONE                        (0x00000000)
-#define TS_CRYPTO_ALG_MD2                         (0x02000001)
-#define TS_CRYPTO_ALG_MD4                         (0x02000002)
 #define TS_CRYPTO_ALG_MD5                         (0x02000003)
 #define TS_CRYPTO_ALG_RIPEMD160                   (0x02000004)
 #define TS_CRYPTO_ALG_SHA_1                       (0x02000005)
@@ -100,4 +97,4 @@
   struct ts_crypto_key_policy policy;
 };
 
-#endif /* TS_CRYPTO_KEY_ATTRIBUTES_H */
\ No newline at end of file
+#endif /* TS_CRYPTO_KEY_ATTRIBUTES_H */

protocols/service/crypto/protobuf/key_attributes.proto

diff --git a/protocols/service/crypto/protobuf/key_attributes.proto b/protocols/service/crypto/protobuf/key_attributes.proto
index 2415d5c..bdf2a67 100644
--- a/protocols/service/crypto/protobuf/key_attributes.proto
+++ b/protocols/service/crypto/protobuf/key_attributes.proto
@@ -15,7 +15,6 @@
   KEY_TYPE_AES                    = 0x2400;
   KEY_TYPE_DES                    = 0x2301;
   KEY_TYPE_CAMELLIA               = 0x2403;
-  KEY_TYPE_ARC4                   = 0x2002;
   KEY_TYPE_CHACHA20               = 0x2004;
   KEY_TYPE_RSA_PUBLIC_KEY         = 0x4001;
   KEY_TYPE_RSA_KEY_PAIR           = 0x7001;
@@ -43,8 +42,6 @@
 /* Crypto algorithms */
 enum Alg {
   ALG_NONE                        = 0x00000000;
-  ALG_MD2                         = 0x02000001;
-  ALG_MD4                         = 0x02000002;
   ALG_MD5                         = 0x02000003;
   ALG_RIPEMD160                   = 0x02000004;
   ALG_SHA_1                       = 0x02000005;
@@ -106,4 +103,4 @@
   uint32 lifetime = 3;
   uint32 id = 4;
   KeyPolicy policy = 5;
-}
\ No newline at end of file
+}