Declare SM3, SM4, EAX, EAXprime

Declare key types and algorithms for the SM3 hash function, the SM4
block cipher and the EAX and EAXprime AEAD modes over block ciphers.

Author: gilles-peskine-arm

include/psa/crypto_values.h

@@ -411,6 +411,10 @@
  * ARIA block cipher. */
 #define PSA_KEY_TYPE_ARIA                           ((psa_key_type_t)0x2405)
 
+/** Key for a cipher, AEAD or MAC algorithm based on the
+ * SM4 block cipher. */
+#define PSA_KEY_TYPE_SM4                            ((psa_key_type_t)0x2406)
+
 /** Key for the RC4 stream cipher.
  *
  * Note that RC4 is weak and deprecated and should only be used in
@@ -760,6 +764,8 @@
 #define PSA_ALG_RIPEMD160                       ((psa_algorithm_t)0x01000004)
 /** SHA1 */
 #define PSA_ALG_SHA_1                           ((psa_algorithm_t)0x01000005)
+/** SM3 */
+#define PSA_ALG_SM3                             ((psa_algorithm_t)0x01000006)
 /** SHA2-224 */
 #define PSA_ALG_SHA_224                         ((psa_algorithm_t)0x01000008)
 /** SHA2-256 */
@@ -1055,6 +1061,20 @@
  */
 #define PSA_ALG_GCM                             ((psa_algorithm_t)0x06401002)
 
+/** The EAX authenticated encryption algorithm.
+ *
+ * The underlying block cipher is determined by the key type.
+ */
+#define PSA_ALG_EAX                             ((psa_algorithm_t)0x06401003)
+
+/** The EAXprime authenticated encryption algorithm defined in ANSI C12.22.
+ *
+ * The underlying block cipher is determined by the key type.
+ *
+ * Note that EAXprime is unsafe with messages that are shorter than the key.
+ */
+#define PSA_ALG_EAX_PRIME                       ((psa_algorithm_t)0x06401004)
+
 /** The Chacha20-Poly1305 AEAD algorithm.
  *
  * The ChaCha20_Poly1305 construction is defined in RFC 7539.

tests/suites/test_suite_psa_crypto_metadata.data

@@ -18,6 +18,10 @@ Hash: SHA-1
 depends_on:MBEDTLS_SHA1_C
 hash_algorithm:PSA_ALG_SHA_1:20
 
+Hash: SM3
+depends_on:MBEDTLS_SM3_C
+hash_algorithm:PSA_ALG_SM3:32
+
 Hash: SHA-2 SHA-224
 depends_on:MBEDTLS_SHA256_C
 hash_algorithm:PSA_ALG_SHA_224:28
@@ -198,6 +202,14 @@ AEAD: GCM
 depends_on:MBEDTLS_GCM_C
 aead_algorithm:PSA_ALG_GCM:ALG_IS_AEAD_ON_BLOCK_CIPHER:16
 
+AEAD: EAX
+depends_on:MBEDTLS_EAX_C
+aead_algorithm:PSA_ALG_EAX:ALG_IS_AEAD_ON_BLOCK_CIPHER:16
+
+AEAD: EAXprime
+depends_on:MBEDTLS_EAX_C
+aead_algorithm:PSA_ALG_EAX_PRIME:ALG_IS_AEAD_ON_BLOCK_CIPHER:16
+
 AEAD: ChaCha20_Poly1305
 depends_on:MBEDTLS_CHACHAPOLY_C
 aead_algorithm:PSA_ALG_CHACHA20_POLY1305:0:16
@@ -343,6 +355,10 @@ Block cipher key type: ARIA
 depends_on:MBEDTLS_ARIA_C
 block_cipher_key_type:PSA_KEY_TYPE_ARIA:16
 
+Block cipher key type: SM4
+depends_on:MBEDTLS_SM4_C
+block_cipher_key_type:PSA_KEY_TYPE_SM4:16
+
 Stream cipher key type: ARC4
 depends_on:MBEDTLS_ARC4_C
 stream_cipher_key_type:PSA_KEY_TYPE_ARC4