From f0c28eff09288fde5cead64d07eaef450fe3843a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?=
<manuel.pegourie-gonnard@arm.com>
Date: Fri, 7 May 2021 12:13:48 +0200
Subject: [PATCH] Avoid introducing PSA_ALG_NONE for now
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com>
---
include/psa/crypto_values.h | 10 ++--------
programs/psa/psa_constant_names_generated.c | 1 -
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/include/psa/crypto_values.h b/include/psa/crypto_values.h
index 722f5bafe..5fba5382c 100644
--- a/include/psa/crypto_values.h
+++ b/include/psa/crypto_values.h
@@ -713,12 +713,6 @@
1u << PSA_GET_KEY_TYPE_BLOCK_SIZE_EXPONENT(type) : \
0u)
-/** An invalid algorithm identifier value.
- *
- * Zero is not the encoding of any algorithm.
- */
-#define PSA_ALG_NONE ((psa_algorithm_t)0)
-
/** Vendor-defined algorithm flag.
*
* Algorithms defined by this standard will never have the #PSA_ALG_VENDOR_FLAG
@@ -1940,10 +1934,10 @@
* \return The underlying hash algorithm if alg is a composite algorithm that
* uses a hash algorithm.
*
- * \return #PSA_ALG_NONE if alg is not a composite algorithm that uses a hash.
+ * \return \c 0 if alg is not a composite algorithm that uses a hash.
*/
#define PSA_ALG_GET_HASH(alg) \
- (((alg) & 0x000000ff) == 0 ? PSA_ALG_NONE : 0x02000000 | ((alg) & 0x000000ff))
+ (((alg) & 0x000000ff) == 0 ? ((psa_algorithm_t)0) : 0x02000000 | ((alg) & 0x000000ff))
/**@}*/
diff --git a/programs/psa/psa_constant_names_generated.c b/programs/psa/psa_constant_names_generated.c
index 63c79ee9c..34919df76 100644
--- a/programs/psa/psa_constant_names_generated.c
+++ b/programs/psa/psa_constant_names_generated.c
@@ -223,7 +223,6 @@ static int psa_snprint_algorithm(char *buffer, size_t buffer_size,
case PSA_ALG_MD2: append(&buffer, buffer_size, &required_size, "PSA_ALG_MD2", 11); break;
case PSA_ALG_MD4: append(&buffer, buffer_size, &required_size, "PSA_ALG_MD4", 11); break;
case PSA_ALG_MD5: append(&buffer, buffer_size, &required_size, "PSA_ALG_MD5", 11); break;
- case PSA_ALG_NONE: append(&buffer, buffer_size, &required_size, "PSA_ALG_NONE", 12); break;
case PSA_ALG_OFB: append(&buffer, buffer_size, &required_size, "PSA_ALG_OFB", 11); break;
case PSA_ALG_PBKDF2_AES_CMAC_PRF_128: append(&buffer, buffer_size, &required_size, "PSA_ALG_PBKDF2_AES_CMAC_PRF_128", 31); break;
case PSA_ALG_PBKDF2_HMAC_BASE: append(&buffer, buffer_size, &required_size, "PSA_ALG_PBKDF2_HMAC_BASE", 24); break;