feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #915 from SparkiDev/blake2b_init

Browse Source 
Blake2b fix for GCC 5.4
This commit is contained in:
toddouska
2017-05-15 08:59:54 -07:00
committed by GitHub
parent bb60f7a4a4 f8023b808f
commit da15b54529
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
wolfcrypt/src/blake2b.c
View File

@ -126,6 +126,7 @@ int blake2b_init( blake2b_state *S, const byte outlen )
if ( ( !outlen ) || ( outlen > BLAKE2B_OUTBYTES ) ) return -1; if ( ( !outlen ) || ( outlen > BLAKE2B_OUTBYTES ) ) return -1;
#ifdef WOLFSSL_BLAKE2B_INIT_EACH_FIELD
P->digest_length = outlen; P->digest_length = outlen;
P->key_length = 0; P->key_length = 0;
P->fanout = 1; P->fanout = 1;
@ -137,6 +138,12 @@ int blake2b_init( blake2b_state *S, const byte outlen )
XMEMSET( P->reserved, 0, sizeof( P->reserved ) ); XMEMSET( P->reserved, 0, sizeof( P->reserved ) );
XMEMSET( P->salt, 0, sizeof( P->salt ) ); XMEMSET( P->salt, 0, sizeof( P->salt ) );
XMEMSET( P->personal, 0, sizeof( P->personal ) ); XMEMSET( P->personal, 0, sizeof( P->personal ) );
#else
XMEMSET( P, 0, sizeof( *P ) );
P->digest_length = outlen;
P->fanout = 1;
P->depth = 1;
#endif
return blake2b_init_param( S, P ); return blake2b_init_param( S, P );
} }
@ -150,6 +157,7 @@ int blake2b_init_key( blake2b_state *S, const byte outlen, const void *key,
if ( !key || !keylen || keylen > BLAKE2B_KEYBYTES ) return -1; if ( !key || !keylen || keylen > BLAKE2B_KEYBYTES ) return -1;
#ifdef WOLFSSL_BLAKE2B_INIT_EACH_FIELD
P->digest_length = outlen; P->digest_length = outlen;
P->key_length = keylen; P->key_length = keylen;
P->fanout = 1; P->fanout = 1;
@ -161,6 +169,13 @@ int blake2b_init_key( blake2b_state *S, const byte outlen, const void *key,
XMEMSET( P->reserved, 0, sizeof( P->reserved ) ); XMEMSET( P->reserved, 0, sizeof( P->reserved ) );
XMEMSET( P->salt, 0, sizeof( P->salt ) ); XMEMSET( P->salt, 0, sizeof( P->salt ) );
XMEMSET( P->personal, 0, sizeof( P->personal ) ); XMEMSET( P->personal, 0, sizeof( P->personal ) );
#else
XMEMSET( P, 0, sizeof( *P ) );
P->digest_length = outlen;
P->key_length = keylen;
P->fanout = 1;
P->depth = 1;
#endif
if( blake2b_init_param( S, P ) < 0 ) return -1; if( blake2b_init_param( S, P ) < 0 ) return -1;