espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-06-01 16:16:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(util): support SHA224/SHA384 calculation although call sha256/sha512 APIs

Browse Source
This commit is contained in:
Dong Heng
2019-12-30 19:31:17 +08:00
parent b02ad1477b
commit aa79ba108a
5 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/libsodium/port/crypto_hash_mbedtls/crypto_hash_sha256_mbedtls.c
View File

@ -46,6 +46,7 @@ static void sha256_libsodium_to_mbedtls(mbedtls_sha256_context *mb_ctx, crypto_h
memcpy(mb_ctx->total, &ls_state->count, sizeof(mb_ctx->total));
memcpy(mb_ctx->state, ls_state->state, sizeof(mb_ctx->state));
memcpy(mb_ctx->buffer, ls_state->buf, sizeof(mb_ctx->buffer));
mb_ctx->is224 = 0;
}
int

1
components/libsodium/port/crypto_hash_mbedtls/crypto_hash_sha512_mbedtls.c
View File

@ -47,6 +47,7 @@ static void sha512_libsodium_to_mbedtls(mbedtls_sha512_context *mb_ctx, crypto_h
memcpy(mb_ctx->total, ls_state->count, sizeof(mb_ctx->total));
memcpy(mb_ctx->state, ls_state->state, sizeof(mb_ctx->state));
memcpy(mb_ctx->buffer, ls_state->buf, sizeof(mb_ctx->buffer));
mb_ctx->is384 = 0;
}
int

4
components/util/include/esp_sha.h
View File

@ -31,12 +31,16 @@ typedef struct {
uint32_t total[2];
uint32_t state[8];
uint8_t buffer[64];
int is224;
} esp_sha256_t;
typedef struct {
uint64_t total[2];
uint64_t state[8];
uint8_t buffer[128];
int is384;
} esp_sha512_t;
typedef esp_sha256_t esp_sha224_t;

12
components/util/src/sha256.c
View File

@ -108,6 +108,8 @@ int esp_sha256_init(esp_sha256_t *ctx)
{
util_assert(ctx);
ctx->is224 = 0;
ctx->total[0] = 0;
ctx->total[1] = 0;
@ -127,6 +129,8 @@ int esp_sha224_init(esp_sha224_t *ctx)
{
util_assert(ctx);
ctx->is224 = 1;
ctx->total[0] = 0;
ctx->total[1] = 0;
@ -230,19 +234,19 @@ int esp_sha224_finish(esp_sha224_t *ctx, void *dest)
ESP_PUT_BE32(out + 20, ctx->state[5]);
ESP_PUT_BE32(out + 24, ctx->state[6]);
if (!ctx->is224) {
ESP_PUT_BE32(out + 28, ctx->state[7]);
}
return( 0 );
}
int esp_sha256_finish(esp_sha256_t *ctx, void *dest)
{
uint8_t *out = (uint8_t *)dest;
util_assert(ctx);
util_assert(dest);
esp_sha224_finish(ctx, dest);
ESP_PUT_BE32(out + 28, ctx->state[7]);
return 0;
}

14
components/util/src/sha512.c
View File

@ -159,6 +159,8 @@ int esp_sha512_init(esp_sha512_t *ctx)
{
util_assert(ctx);
ctx->is384 = 0;
ctx->total[0] = 0;
ctx->total[1] = 0;
@ -178,6 +180,8 @@ int esp_sha384_init(esp_sha384_t *ctx)
{
util_assert(ctx);
ctx->is384 = 1;
ctx->total[0] = 0;
ctx->total[1] = 0;
@ -279,20 +283,20 @@ int esp_sha384_finish(esp_sha384_t *ctx, void *dest)
PUT_UINT64_BE(ctx->state[4], output, 32);
PUT_UINT64_BE(ctx->state[5], output, 40);
if (!ctx->is384) {
PUT_UINT64_BE(ctx->state[6], output, 48);
PUT_UINT64_BE(ctx->state[7], output, 56);
}
return 0;
}
int esp_sha512_finish(esp_sha512_t *ctx, void *dest)
{
uint8_t *output = (uint8_t *)dest;
util_assert(ctx);
util_assert(dest);
esp_sha384_finish(ctx, dest);
PUT_UINT64_BE(ctx->state[6], output, 48);
PUT_UINT64_BE(ctx->state[7], output, 56);
return 0;
}