Declare more stream ciphers

Declare ciphers from the eSTREAM portfolio and ZUC.

Author: gilles-peskine-arm

include/psa/crypto_values.h

@@ -430,6 +430,38 @@
  */
 #define PSA_KEY_TYPE_CHACHA20                       ((psa_key_type_t)0x2004)
 
+/** Key for the Salsa20/12 stream cipher.
+ */
+#define PSA_KEY_TYPE_SALSA20_12                     ((psa_key_type_t)0x2007)
+
+/** Key for the HC-128 or HC-256 stream cipher algorithm.
+ */
+#define PSA_KEY_TYPE_HC                             ((psa_key_type_t)0x2008)
+
+/** Key for the Rabbit stream cipher algorithm.
+ */
+#define PSA_KEY_TYPE_RABBIT                         ((psa_key_type_t)0x200b)
+
+/** Key for the SOSEMANUK stream cipher algorithm.
+ */
+#define PSA_KEY_TYPE_SOSEMANUK                      ((psa_key_type_t)0x200d)
+
+/** Key for the Grain v1 stream cipher algorithm.
+ */
+#define PSA_KEY_TYPE_GRAIN                          ((psa_key_type_t)0x200e)
+
+/** Key for the MICKEY 2.0 stream cipher algorithm.
+ */
+#define PSA_KEY_TYPE_MICKEY_2                       ((psa_key_type_t)0x2010)
+
+/** Key for the Trivium stream cipher algorithm.
+ */
+#define PSA_KEY_TYPE_TRIVIUM                        ((psa_key_type_t)0x2013)
+
+/** Key for the ZUC stream cipher.
+ */
+#define PSA_KEY_TYPE_ZUC                            ((psa_key_type_t)0x2015)
+
 /** RSA public key. */
 #define PSA_KEY_TYPE_RSA_PUBLIC_KEY                 ((psa_key_type_t)0x4001)
 /** RSA key pair (private and public key). */
@@ -988,6 +1020,38 @@
  */
 #define PSA_ALG_CHACHA20                        ((psa_algorithm_t)0x04800004)
 
+/** The Salsa20/12 stream cipher algorithm.
+ */
+#define PSA_ALG_SALSA20_12                      ((psa_algorithm_t)0x04800007)
+
+/** The HC-128 and HC-256 stream cipher algorithms.
+ */
+#define PSA_ALG_HC                              ((psa_algorithm_t)0x04800008)
+
+/** The Rabbit stream cipher algorithm.
+ */
+#define PSA_ALG_RABBIT                          ((psa_algorithm_t)0x0480000b)
+
+/** The SOSEMANUK stream cipher algorithm.
+ */
+#define PSA_ALG_SOSEMANUK                       ((psa_algorithm_t)0x0480000d)
+
+/** The Grain v1 stream cipher algorithm.
+ */
+#define PSA_ALG_GRAIN                           ((psa_algorithm_t)0x0480000e)
+
+/** The MICKEY 2.0 stream cipher algorithm.
+ */
+#define PSA_ALG_MICKEY_2                        ((psa_algorithm_t)0x04800010)
+
+/** The Trivium stream cipher algorithm.
+ */
+#define PSA_ALG_TRIVIUM                         ((psa_algorithm_t)0x04800013)
+
+/** The ZUC stream cipher algorithm.
+ */
+#define PSA_ALG_ZUC                             ((psa_algorithm_t)0x04800015)
+
 /** The CTR stream cipher mode.
  *
  * CTR is a stream cipher which is built from a block cipher.

tests/suites/test_suite_psa_crypto_metadata.data

@@ -163,13 +163,35 @@ 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
 
 Cipher: ChaCha20
-depends_on:MBEDTLS_CHACHA_C
 cipher_algorithm:PSA_ALG_CHACHA20:ALG_IS_STREAM_CIPHER
 
+Cipher: Salsa20/12
+cipher_algorithm:PSA_ALG_SALSA20_12:ALG_IS_STREAM_CIPHER
+
+Cipher: HC-128 or HC-256
+cipher_algorithm:PSA_ALG_HC:ALG_IS_STREAM_CIPHER
+
+Cipher: Rabbit
+cipher_algorithm:PSA_ALG_RABBIT:ALG_IS_STREAM_CIPHER
+
+Cipher: SOSEMANUK
+cipher_algorithm:PSA_ALG_SOSEMANUK:ALG_IS_STREAM_CIPHER
+
+Cipher: Grain v1
+cipher_algorithm:PSA_ALG_GRAIN:ALG_IS_STREAM_CIPHER
+
+Cipher: MICKEY 2.0
+cipher_algorithm:PSA_ALG_MICKEY_2:ALG_IS_STREAM_CIPHER
+
+Cipher: TRIVIUM
+cipher_algorithm:PSA_ALG_TRIVIUM:ALG_IS_STREAM_CIPHER
+
+Cipher: ZUC
+cipher_algorithm:PSA_ALG_ZUC:ALG_IS_STREAM_CIPHER
+
 Cipher: CTR
 depends_on:MBEDTLS_CIPHER_C:MBEDTLS_CIPHER_MODE_CTR
 cipher_algorithm:PSA_ALG_CTR:ALG_IS_STREAM_CIPHER
@@ -360,13 +382,35 @@ 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
 
 Stream cipher key type: ChaCha20
-depends_on:MBEDTLS_CHACHA20_C
 stream_cipher_key_type:PSA_KEY_TYPE_CHACHA20
 
+Stream cipher key type: Salsa20/12
+stream_cipher_key_type:PSA_KEY_TYPE_SALSA20_12
+
+Stream cipher key type: HC-128 or HC-256
+stream_cipher_key_type:PSA_KEY_TYPE_HC
+
+Stream cipher key type: Rabbit
+stream_cipher_key_type:PSA_KEY_TYPE_RABBIT
+
+Stream cipher key type: SOSEMANUK
+stream_cipher_key_type:PSA_KEY_TYPE_SOSEMANUK
+
+Stream cipher key type: MICKEY 2.0
+stream_cipher_key_type:PSA_KEY_TYPE_MICKEY_2
+
+Stream cipher key type: Grain v1
+stream_cipher_key_type:PSA_KEY_TYPE_GRAIN
+
+Stream cipher key type: Trivium
+stream_cipher_key_type:PSA_KEY_TYPE_TRIVIUM
+
+Stream cipher key type: ZUC
+stream_cipher_key_type:PSA_KEY_TYPE_ZUC
+
 Key type: RSA public key
 depends_on:MBEDTLS_RSA_C
 key_type:PSA_KEY_TYPE_RSA_PUBLIC_KEY:KEY_TYPE_IS_PUBLIC_KEY | KEY_TYPE_IS_RSA