commit 7bfcfac164604f8c17947bf8bd8e06a1768a843f
author Gilles Peskine <Gilles.Peskine@arm.com> Mon Dec 02 17:22:26 2019 +0100
committer Gilles Peskine <Gilles.Peskine@arm.com> Fri Jan 31 10:15:32 2020 +0100
tree 453dd272df2787e7d91a9f0b48e41c8192731a99
parent 8fe6e0de3aa7ac0af8ae14e536c88b699f8346c7

Change key type encodings to avoid bit 16

Key types are now encoded through a category in the upper 4 bits (bits
28-31) and a type-within-category in the next 11 bits (bits 17-27),
with bit 16 unused and bits 0-15 only used for the EC curve or DH
group.

For symmetric keys, bits 20-22 encode the block size (0x0=stream,
0x3=8B, 0x4=16B).

include/psa/crypto_extra.h

diff --git a/include/psa/crypto_extra.h b/include/psa/crypto_extra.h
index 31e339c..af4b958 100644
--- a/include/psa/crypto_extra.h
+++ b/include/psa/crypto_extra.h
@@ -329,7 +329,7 @@
  * string. The length of the byte string is the length of the base prime `p`
  * in bytes.
  */
-#define PSA_KEY_TYPE_DSA_PUBLIC_KEY             ((psa_key_type_t)0x60020000)
+#define PSA_KEY_TYPE_DSA_PUBLIC_KEY             ((psa_key_type_t)0x60040000)
 
 /** DSA key pair (private and public key).
  *
@@ -347,7 +347,7 @@
  * Add 1 to the resulting integer and use this as the private key *x*.
  *
  */
-#define PSA_KEY_TYPE_DSA_KEY_PAIR                ((psa_key_type_t)0x70020000)
+#define PSA_KEY_TYPE_DSA_KEY_PAIR                ((psa_key_type_t)0x70040000)
 
 /** Whether a key type is an DSA key (pair or public-only). */
 #define PSA_KEY_TYPE_IS_DSA(type)                                       \