wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 18:57:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Check return value in BLAKE2 key init functions

Browse Source 
If built with smallstack, allocations in `blake2s_update` and `blake2b_update` may fail,
so the error must be propagated.
This commit is contained in:
Guido Vranken
2021-06-07 03:34:44 +02:00
parent 898b9d5e24
commit 96b7b193d7
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
wolfcrypt/src/blake2b.c
View File

@ -152,6 +152,7 @@ int blake2b_init( blake2b_state *S, const byte outlen )
int blake2b_init_key( blake2b_state *S, const byte outlen, const void *key, int blake2b_init_key( blake2b_state *S, const byte outlen, const void *key,
const byte keylen ) const byte keylen )
{ {
int ret = 0;
blake2b_param P[1]; blake2b_param P[1];
if ( ( !outlen ) || ( outlen > BLAKE2B_OUTBYTES ) ) return BAD_FUNC_ARG; if ( ( !outlen ) || ( outlen > BLAKE2B_OUTBYTES ) ) return BAD_FUNC_ARG;
@ -178,10 +179,8 @@ int blake2b_init_key( blake2b_state *S, const byte outlen, const void *key,
P->depth = 1; P->depth = 1;
#endif #endif
{ ret = blake2b_init_param( S, P );
int ret = blake2b_init_param( S, P ); if ( ret < 0 ) return ret;
if ( ret < 0 ) return ret;
}
{ {
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
@ -196,7 +195,7 @@ int blake2b_init_key( blake2b_state *S, const byte outlen, const void *key,
XMEMSET( block, 0, BLAKE2B_BLOCKBYTES ); XMEMSET( block, 0, BLAKE2B_BLOCKBYTES );
XMEMCPY( block, key, keylen ); XMEMCPY( block, key, keylen );
blake2b_update( S, block, BLAKE2B_BLOCKBYTES ); ret = blake2b_update( S, block, BLAKE2B_BLOCKBYTES );
secure_zero_memory( block, BLAKE2B_BLOCKBYTES ); /* Burn the key from */ secure_zero_memory( block, BLAKE2B_BLOCKBYTES ); /* Burn the key from */
/* memory */ /* memory */
@ -204,7 +203,7 @@ int blake2b_init_key( blake2b_state *S, const byte outlen, const void *key,
XFREE(block, NULL, DYNAMIC_TYPE_TMP_BUFFER); XFREE(block, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif #endif
} }
return 0; return ret;
} }
static WC_INLINE int blake2b_compress( static WC_INLINE int blake2b_compress(

13
wolfcrypt/src/blake2s.c
View File

@ -148,6 +148,7 @@ int blake2s_init( blake2s_state *S, const byte outlen )
int blake2s_init_key( blake2s_state *S, const byte outlen, const void *key, int blake2s_init_key( blake2s_state *S, const byte outlen, const void *key,
const byte keylen ) const byte keylen )
{ {
int ret = 0;
blake2s_param P[1]; blake2s_param P[1];
if ( ( !outlen ) || ( outlen > BLAKE2S_OUTBYTES ) ) return BAD_FUNC_ARG; if ( ( !outlen ) || ( outlen > BLAKE2S_OUTBYTES ) ) return BAD_FUNC_ARG;
@ -174,11 +175,9 @@ int blake2s_init_key( blake2s_state *S, const byte outlen, const void *key,
P->depth = 1; P->depth = 1;
#endif #endif
{ ret = blake2s_init_param( S, P );
int ret = blake2s_init_param( S, P ); if (ret < 0)
if (ret < 0) return ret;
return ret;
}
{ {
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
@ -193,7 +192,7 @@ int blake2s_init_key( blake2s_state *S, const byte outlen, const void *key,
XMEMSET( block, 0, BLAKE2S_BLOCKBYTES ); XMEMSET( block, 0, BLAKE2S_BLOCKBYTES );
XMEMCPY( block, key, keylen ); XMEMCPY( block, key, keylen );
blake2s_update( S, block, BLAKE2S_BLOCKBYTES ); ret = blake2s_update( S, block, BLAKE2S_BLOCKBYTES );
secure_zero_memory( block, BLAKE2S_BLOCKBYTES ); /* Burn the key from */ secure_zero_memory( block, BLAKE2S_BLOCKBYTES ); /* Burn the key from */
/* memory */ /* memory */
@ -201,7 +200,7 @@ int blake2s_init_key( blake2s_state *S, const byte outlen, const void *key,
XFREE(block, NULL, DYNAMIC_TYPE_TMP_BUFFER); XFREE(block, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif #endif
} }
return 0; return ret;
} }
static WC_INLINE int blake2s_compress( static WC_INLINE int blake2s_compress(