From ad0f9349ae74976f054fc0aba35c0ec82c2837c8 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Wed, 13 Jun 2018 08:17:40 +0000 Subject: Added more conditionals to CRY driver. Removed conditionals from high level functions, those functions are not meant to be excluded. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12092 110e8d01-0319-4d1e-a829-52ad28d1bb01 --- os/hal/include/hal_crypto.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'os/hal/include/hal_crypto.h') diff --git a/os/hal/include/hal_crypto.h b/os/hal/include/hal_crypto.h index 4152aeb2b..a31dbcd8c 100644 --- a/os/hal/include/hal_crypto.h +++ b/os/hal/include/hal_crypto.h @@ -99,7 +99,7 @@ typedef enum { CRY_ERR_INV_KEY_SIZE = 2, /**< Invalid key size. */ CRY_ERR_INV_KEY_TYPE = 3, /**< Invalid key type. */ CRY_ERR_INV_KEY_ID = 4, /**< Invalid key identifier. */ - CRY_ERR_OPERATION_FAILURE = 5 /**< Requested operation failed.*/ + CRY_ERR_OP_FAILURE = 5 /**< Requested operation failed.*/ } cryerror_t; /** @@ -342,7 +342,6 @@ extern "C" { size_t size, const uint8_t *in); cryerror_t crySHA512Final(CRYDriver *cryp, SHA512Context *sha512ctxp, uint8_t *out); -#if (CRY_LLD_SUPPORTS_HMAC_SHA256 == TRUE) || defined(__DOXYGEN__) cryerror_t cryHMACSHA256Init(CRYDriver *cryp, HMACSHA256Context *hmacsha256ctxp); cryerror_t cryHMACSHA256Update(CRYDriver *cryp, @@ -352,8 +351,6 @@ extern "C" { cryerror_t cryHMACSHA256Final(CRYDriver *cryp, HMACSHA256Context *hmacsha256ctxp, uint8_t *out); -#endif /* CRY_LLD_SUPPORTS_HMAC_SHA256 */ -#if (CRY_LLD_SUPPORTS_HMAC_SHA512 == TRUE) || defined(__DOXYGEN__) cryerror_t cryHMACSHA512Init(CRYDriver *cryp, HMACSHA512Context *hmacsha512ctxp); cryerror_t cryHMACSHA512Update(CRYDriver *cryp, @@ -363,7 +360,6 @@ extern "C" { cryerror_t cryHMACSHA512Final(CRYDriver *cryp, HMACSHA512Context *hmacsha512ctxp, uint8_t *out); -#endif /* CRY_LLD_SUPPORTS_HMAC_SHA512 */ cryerror_t cryTRNG(CRYDriver *cryp, uint8_t *out); #ifdef __cplusplus } -- cgit v1.2.3