diff options
author | areviu <areviu.info@gmail.com> | 2018-05-19 13:15:06 +0000 |
---|---|---|
committer | areviu <areviu.info@gmail.com> | 2018-05-19 13:15:06 +0000 |
commit | 7454fa6ad5597582688495252c801c8daeeaf07e (patch) | |
tree | 48d89549877a21be7d22fe922d45ff70a2c65df4 /os/hal/ports/SAMA/LLD | |
parent | e9399566d7eaa76ca6114d108d1b7bf34fca157b (diff) | |
download | ChibiOS-7454fa6ad5597582688495252c801c8daeeaf07e.tar.gz ChibiOS-7454fa6ad5597582688495252c801c8daeeaf07e.tar.bz2 ChibiOS-7454fa6ad5597582688495252c801c8daeeaf07e.zip |
added SAMA HMAC + fixed TRNG 128 bit generation
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12042 110e8d01-0319-4d1e-a829-52ad28d1bb01
Diffstat (limited to 'os/hal/ports/SAMA/LLD')
-rw-r--r-- | os/hal/ports/SAMA/LLD/CRYPTOv1/sama_sha_lld.c | 70 |
1 files changed, 52 insertions, 18 deletions
diff --git a/os/hal/ports/SAMA/LLD/CRYPTOv1/sama_sha_lld.c b/os/hal/ports/SAMA/LLD/CRYPTOv1/sama_sha_lld.c index a2c925cd5..b88386366 100644 --- a/os/hal/ports/SAMA/LLD/CRYPTOv1/sama_sha_lld.c +++ b/os/hal/ports/SAMA/LLD/CRYPTOv1/sama_sha_lld.c @@ -179,6 +179,21 @@ cryerror_t sama_sha_lld_init(CRYDriver *cryp, struct sha_data *sha) algoregval = SHA_MR_ALGO_SHA512;
break;
#endif
+ case CRY_HMACSHA_1:
+ algoregval = SHA_MR_ALGO_HMAC_SHA1;
+ break;
+ case CRY_HMACSHA_224:
+ algoregval = SHA_MR_ALGO_HMAC_SHA224;
+ break;
+ case CRY_HMACSHA_256:
+ algoregval = SHA_MR_ALGO_HMAC_SHA256;
+ break;
+ case CRY_HMACSHA_384:
+ algoregval = SHA_MR_ALGO_HMAC_SHA384;
+ break;
+ case CRY_HMACSHA_512:
+ algoregval = SHA_MR_ALGO_HMAC_SHA512;
+ break;
default:
osalMutexUnlock(&cryp->mutex);
return CRY_ERR_INV_ALGO;
@@ -232,14 +247,19 @@ static uint32_t shaOutputSize(shadalgo_t algo) {
switch (algo) {
case CRY_SHA_1:
+ case CRY_HMACSHA_1:
return 20;
case CRY_SHA_224:
+ case CRY_HMACSHA_224:
return 28;
case CRY_SHA_256:
+ case CRY_HMACSHA_256:
return 32;
case CRY_SHA_384:
+ case CRY_HMACSHA_384:
return 48;
case CRY_SHA_512:
+ case CRY_HMACSHA_512:
return 64;
default:
return 0;
@@ -248,28 +268,42 @@ static uint32_t shaOutputSize(shadalgo_t algo) static uint32_t shadPaddedMessSize(uint8_t mode, uint32_t len)
{
- uint32_t k;
-
- switch (mode) {
- case CRY_SHA_1:
- case CRY_SHA_224:
- case CRY_SHA_256:
- k = (512 + 448 - (((len * 8) % 512) + 1)) % 512;
- len += (k - 7) / 8 + 9;
- break;
- case CRY_SHA_384:
- case CRY_SHA_512:
- k = (1024 + 896 - (((len * 8) % 1024) + 1)) % 1024;
- len += (k - 7) / 8 + 17;
- break;
- }
- return len;
+ uint32_t k;
+
+ switch (mode) {
+ case CRY_SHA_1:
+ case CRY_SHA_224:
+ case CRY_SHA_256:
+ case CRY_HMACSHA_1:
+ case CRY_HMACSHA_224:
+ case CRY_HMACSHA_256:
+ k = (512 + 448 - (((len * 8) % 512) + 1)) % 512;
+ len += (k - 7) / 8 + 9;
+ break;
+ case CRY_SHA_384:
+ case CRY_SHA_512:
+ case CRY_HMACSHA_384:
+ case CRY_HMACSHA_512:
+ k = (1024 + 896 - (((len * 8) % 1024) + 1)) % 1024;
+ len += (k - 7) / 8 + 17;
+ break;
+ }
+ return len;
}
uint8_t shaBlockSize(shadalgo_t algo)
{
- if ( (algo == CRY_SHA_384) || (algo == CRY_SHA_512) ) {
- return 128;
+
+ switch(algo)
+ {
+ case CRY_SHA_384:
+ case CRY_HMACSHA_384:
+ case CRY_SHA_512:
+ case CRY_HMACSHA_512:
+ return 128;
+
+ default:
+ break;
}
return 64;
|