Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

hwcrypto sha: Fix initialisation of SHA hardware in esp_shaX_start functions

Browse source 
Problem exposed by previous commit.
This commit is contained in:
Angus Gratton 2016-09-09 14:27:34 +10:00
parent eb47a25012
commit 46a9754b8e
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
components/esp32/hwcrypto/sha.c
View file

@ -86,8 +86,9 @@ void esp_sha1_clone( esp_sha_context *dst, const esp_sha_context *src )
*/ */
void esp_sha1_start( esp_sha_context *ctx ) void esp_sha1_start( esp_sha_context *ctx )
{ {
esp_sha_acquire_hardware();
ctx->context_type = SHA1; ctx->context_type = SHA1;
esp_sha_acquire_hardware();
ets_sha_init(&ctx->context);
} }
/* /*
@ -143,12 +144,11 @@ void esp_sha256_clone( esp_sha_context *dst, const esp_sha_context *src )
*/ */
void esp_sha256_start( esp_sha_context *ctx, int is224 ) void esp_sha256_start( esp_sha_context *ctx, int is224 )
{ {
esp_sha_acquire_hardware();
ets_sha_init(&ctx->context);
if ( is224 == 0 ) { if ( is224 == 0 ) {
/* SHA-256 */ /* SHA-256 */
ctx->context_type = SHA2_256; ctx->context_type = SHA2_256;
esp_sha_acquire_hardware();
ets_sha_init(&ctx->context);
} else { } else {
/* SHA-224 is not supported! */ /* SHA-224 is not supported! */
ctx->context_type = SHA_INVALID; ctx->context_type = SHA_INVALID;
@ -160,7 +160,10 @@ void esp_sha256_start( esp_sha_context *ctx, int is224 )
*/ */
void esp_sha256_update( esp_sha_context *ctx, const unsigned char *input, size_t ilen ) void esp_sha256_update( esp_sha_context *ctx, const unsigned char *input, size_t ilen )
{ {
esp_sha_update(ctx, input, ilen, 64); if( ctx->context_type == SHA2_256 ) {
esp_sha_update(ctx, input, ilen, 64);
}
/* SHA-224 is a no-op */
} }
/* /*
@ -170,12 +173,12 @@ void esp_sha256_finish( esp_sha_context *ctx, unsigned char output[32] )
{ {
if ( ctx->context_type == SHA2_256 ) { if ( ctx->context_type == SHA2_256 ) {
ets_sha_finish(&ctx->context, ctx->context_type, output); ets_sha_finish(&ctx->context, ctx->context_type, output);
esp_sha_release_hardware();
} else { } else {
/* No hardware SHA-224 support, but mbedTLS API doesn't allow failure. /* No hardware SHA-224 support, but mbedTLS API doesn't allow failure.
For now, zero the output to make it clear it's not valid. */ For now, zero the output to make it clear it's not valid. */
bzero( output, 28 ); bzero( output, 28 );
} }
esp_sha_release_hardware();
} }
/* /*
@ -218,9 +221,6 @@ void esp_sha512_clone( esp_sha_context *dst, const esp_sha_context *src )
*/ */
void esp_sha512_start( esp_sha_context *ctx, int is384 ) void esp_sha512_start( esp_sha_context *ctx, int is384 )
{ {
esp_sha_acquire_hardware();
ets_sha_init(&ctx->context);
if ( is384 == 0 ) { if ( is384 == 0 ) {
/* SHA-512 */ /* SHA-512 */
ctx->context_type = SHA2_512; ctx->context_type = SHA2_512;
@ -228,6 +228,8 @@ void esp_sha512_start( esp_sha_context *ctx, int is384 )
/* SHA-384 */ /* SHA-384 */
ctx->context_type = SHA2_384; ctx->context_type = SHA2_384;
} }
esp_sha_acquire_hardware();
ets_sha_init(&ctx->context);
} }
/* /*