Declare more algorithms from Mbed TLS

No implementation or tests, just the declaration of key types and
algorithms.

Author: gilles-peskine-arm

include/psa/crypto_values.h

@@ -394,10 +394,23 @@
  */
 #define PSA_KEY_TYPE_DES                            ((psa_key_type_t)0x2301)
 
+/** Key for a cipher or MAC algorithm based on Blowfish.
+ *
+ * The size of the key can be 4 to 56 bytes.
+ *
+ * Note that Blowfish is weak and deprecated and should only be used in
+ * legacy protocols.
+ */
+#define PSA_KEY_TYPE_BLOWFISH                       ((psa_key_type_t)0x2302)
+
 /** Key for a cipher, AEAD or MAC algorithm based on the
  * Camellia block cipher. */
 #define PSA_KEY_TYPE_CAMELLIA                       ((psa_key_type_t)0x2403)
 
+/** Key for a cipher, AEAD or MAC algorithm based on the
+ * ARIA block cipher. */
+#define PSA_KEY_TYPE_ARIA                           ((psa_key_type_t)0x2405)
+
 /** Key for the RC4 stream cipher.
  *
  * Note that RC4 is weak and deprecated and should only be used in
@@ -568,14 +581,22 @@
                        ((type) & PSA_KEY_TYPE_DH_GROUP_MASK) :  \
                        0))
 
-/** Diffie-Hellman groups defined in RFC 7919 Appendix A.
+/** Diffie-Hellman FFDHE groups defined in RFC 7919 Appendix A.
  *
  * This family includes groups with the following key sizes (in bits):
  * 2048, 3072, 4096, 6144, 8192. A given implementation may support
  * all of these sizes or only a subet.
  */
 #define PSA_DH_GROUP_RFC7919            ((psa_dh_group_t) 0x03)
 
+/** Diffie-Hellman MODP groups defined in RFC 3526.
+ *
+ * This family includes groups with the following key sizes (in bits):
+ * 2048, 3072, 4096. A given implementation may support
+ * all of these sizes or only a subet.
+ */
+#define PSA_DH_GROUP_RFC3526            ((psa_dh_group_t) 0x05)
+
 #define PSA_GET_KEY_TYPE_BLOCK_SIZE_EXPONENT(type)      \
     (((type) >> 8) & 7)
 /** The block size of a block cipher.

tests/suites/test_suite_psa_crypto_metadata.data

@@ -134,6 +134,10 @@ MAC: CBC_MAC-3DES
 depends_on:MBEDTLS_DES_C:MBEDTLS_CIPHER_C
 mac_algorithm:PSA_ALG_CBC_MAC:ALG_IS_BLOCK_CIPHER_MAC:8:PSA_KEY_TYPE_DES:192
 
+MAC: CBC_MAC-Blowfish
+depends_on:MBEDTLS_BLOWFISH_C:MBEDTLS_CIPHER_C
+mac_algorithm:PSA_ALG_CBC_MAC:ALG_IS_BLOCK_CIPHER_MAC:8:PSA_KEY_TYPE_BLOWFISH:128
+
 MAC: CMAC-AES-128
 depends_on:MBEDTLS_AES_C:MBEDTLS_CMAC_C
 mac_algorithm:PSA_ALG_CMAC:ALG_IS_BLOCK_CIPHER_MAC:16:PSA_KEY_TYPE_AES:128
@@ -150,6 +154,10 @@ MAC: CMAC-3DES
 depends_on:MBEDTLS_DES_C:MBEDTLS_CMAC_C
 mac_algorithm:PSA_ALG_CMAC:ALG_IS_BLOCK_CIPHER_MAC:8:PSA_KEY_TYPE_DES:192
 
+MAC: CMAC-Blowfish
+depends_on:MBEDTLS_BLOWFISH_C:MBEDTLS_CMAC_C
+mac_algorithm:PSA_ALG_CMAC:ALG_IS_BLOCK_CIPHER_MAC:8:PSA_KEY_TYPE_BLOWFISH:128
+
 Cipher: ARC4
 depends_on:MBEDTLS_ARC4_C
 cipher_algorithm:PSA_ALG_ARC4:ALG_IS_STREAM_CIPHER
@@ -323,10 +331,18 @@ Block cipher key type: DES
 depends_on:MBEDTLS_DES_C
 block_cipher_key_type:PSA_KEY_TYPE_DES:8
 
+Block cipher key type: Blowfish
+depends_on:MBEDTLS_BLOWFISH_C
+block_cipher_key_type:PSA_KEY_TYPE_BLOWFISH:8
+
 Block cipher key type: Camellia
 depends_on:MBEDTLS_CAMELLIA_C
 block_cipher_key_type:PSA_KEY_TYPE_CAMELLIA:16
 
+Block cipher key type: ARIA
+depends_on:MBEDTLS_ARIA_C
+block_cipher_key_type:PSA_KEY_TYPE_ARIA:16
+
 Stream cipher key type: ARC4
 depends_on:MBEDTLS_ARC4_C
 stream_cipher_key_type:PSA_KEY_TYPE_ARC4
@@ -377,3 +393,6 @@ ecc_key_family:PSA_ECC_CURVE_XED
 
 DH group family: RFC 7919
 dh_key_family:PSA_DH_GROUP_RFC7919
+
+DH group family: RFC 3526
+dh_key_family:PSA_DH_GROUP_RFC3526