From d96d3fbf325393f50ac10ffd92258d47dc7e3cc7 Mon Sep 17 00:00:00 2001 From: Theodore Ateba Date: Tue, 12 Jun 2018 11:55:00 +0000 Subject: Add conditional compilation to resolve the compilation error (error: unknown type name) git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12087 110e8d01-0319-4d1e-a829-52ad28d1bb01 --- os/hal/ports/STM32/LLD/CRYPv1/hal_crypto_lld.c | 4 ++++ os/hal/ports/STM32/LLD/CRYPv1/hal_crypto_lld.h | 12 +++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) (limited to 'os/hal/ports') diff --git a/os/hal/ports/STM32/LLD/CRYPv1/hal_crypto_lld.c b/os/hal/ports/STM32/LLD/CRYPv1/hal_crypto_lld.c index 2aa55fdd1..6978ecd6f 100644 --- a/os/hal/ports/STM32/LLD/CRYPv1/hal_crypto_lld.c +++ b/os/hal/ports/STM32/LLD/CRYPv1/hal_crypto_lld.c @@ -1063,6 +1063,7 @@ cryerror_t cry_lld_SHA512_final(CRYDriver *cryp, SHA512Context *sha512ctxp, return CRY_ERR_INV_ALGO; } +#if (CRY_LLD_SUPPORTS_HMAC_SHA256 == TRUE) || defined(__DOXYGEN__) /** * @brief Hash initialization using HMAC_SHA256. * @note Use of this algorithm is not recommended because proven weak. @@ -1138,7 +1139,9 @@ cryerror_t cry_lld_HMACSHA256_final(CRYDriver *cryp, return CRY_ERR_INV_ALGO; } +#endif /* CRY_LLD_SUPPORTS_HMAC_SHA256 */ +#if (CRY_LLD_SUPPORTS_HMAC_SHA512 == TRUE) || defined(__DOXYGEN__) /** * @brief Hash initialization using HMAC_SHA512. * @note Use of this algorithm is not recommended because proven weak. @@ -1214,6 +1217,7 @@ cryerror_t cry_lld_HMACSHA512_final(CRYDriver *cryp, return CRY_ERR_INV_ALGO; } +#endif /* CRY_LLD_SUPPORTS_HMAC_SHA512 */ /** * @brief True random numbers generator. diff --git a/os/hal/ports/STM32/LLD/CRYPv1/hal_crypto_lld.h b/os/hal/ports/STM32/LLD/CRYPv1/hal_crypto_lld.h index 3df88be47..eba045390 100644 --- a/os/hal/ports/STM32/LLD/CRYPv1/hal_crypto_lld.h +++ b/os/hal/ports/STM32/LLD/CRYPv1/hal_crypto_lld.h @@ -38,7 +38,7 @@ #define CRY_LLD_SUPPORTS_AES TRUE #define CRY_LLD_SUPPORTS_AES_ECB TRUE #define CRY_LLD_SUPPORTS_AES_CBC TRUE -#define CRY_LLD_SUPPORTS_AES_CFB FALSE +#define CRY_LLD_SUPPORTS_AES_CFB TRUE #define CRY_LLD_SUPPORTS_AES_CTR TRUE #define CRY_LLD_SUPPORTS_AES_GCM TRUE #define CRY_LLD_SUPPORTS_DES TRUE @@ -297,21 +297,28 @@ extern "C" { const uint8_t *in, uint8_t *out, const uint8_t *iv); +#if (CRY_LLD_SUPPORTS_SHA1 == TRUE) || defined(__DOXYGEN__) cryerror_t cry_lld_SHA1_init(CRYDriver *cryp, SHA1Context *sha1ctxp); cryerror_t cry_lld_SHA1_update(CRYDriver *cryp, SHA1Context *sha1ctxp, size_t size, const uint8_t *in); cryerror_t cry_lld_SHA1_final(CRYDriver *cryp, SHA1Context *sha1ctxp, uint8_t *out); +#endif /* CRY_LLD_SUPPORTS_SHA1 */ +#if (CRY_LLD_SUPPORTS_SHA256 == TRUE) || defined(__DOXYGEN__) cryerror_t cry_lld_SHA256_init(CRYDriver *cryp, SHA256Context *sha256ctxp); cryerror_t cry_lld_SHA256_update(CRYDriver *cryp, SHA256Context *sha256ctxp, size_t size, const uint8_t *in); cryerror_t cry_lld_SHA256_final(CRYDriver *cryp, SHA256Context *sha256ctxp, uint8_t *out); +#endif /* CRY_LLD_SUPPORTS_SHA256 */ +#if (CRY_LLD_SUPPORTS_SHA512 == TRUE) || defined(__DOXYGEN__) cryerror_t cry_lld_SHA512_init(CRYDriver *cryp, SHA512Context *sha512ctxp); cryerror_t cry_lld_SHA512_update(CRYDriver *cryp, SHA512Context *sha512ctxp, size_t size, const uint8_t *in); cryerror_t cry_lld_SHA512_final(CRYDriver *cryp, SHA512Context *sha512ctxp, uint8_t *out); +#endif /* CRY_LLD_SUPPORTS_SHA512 */ +#if (CRY_LLD_SUPPORTS_HMAC_SHA256 == TRUE) || defined(__DOXYGEN__) cryerror_t cry_lld_HMACSHA256_init(CRYDriver *cryp, HMACSHA256Context *hmacsha256ctxp); cryerror_t cry_lld_HMACSHA256_update(CRYDriver *cryp, @@ -320,6 +327,8 @@ extern "C" { cryerror_t cry_lld_HMACSHA256_final(CRYDriver *cryp, HMACSHA256Context *hmacsha256ctxp, uint8_t *out); +#endif /* CRY_LLD_SUPPORTS_HMAC_SHA256 */ +#if (CRY_LLD_SUPPORTS_HMAC_SHA512 == TRUE) || defined(__DOXYGEN__) cryerror_t cry_lld_HMACSHA512_init(CRYDriver *cryp, HMACSHA512Context *hmacsha512ctxp); cryerror_t cry_lld_HMACSHA512_update(CRYDriver *cryp, @@ -328,6 +337,7 @@ extern "C" { cryerror_t cry_lld_HMACSHA512_final(CRYDriver *cryp, HMACSHA512Context *hmacsha512ctxp, uint8_t *out); +#endif /* CRY_LLD_SUPPORTS_HMAC_SHA512 */ cryerror_t cry_lld_TRNG(CRYDriver *cryp, uint8_t *out); #ifdef __cplusplus } -- cgit v1.2.3