kevin/libsodium
1
Fork 0
mirror of https://github.com/jedisct1/libsodium.git synced 2024-12-20 02:25:14 -07:00
Code Releases Wiki Activity

Sync Blake2s changes with Blake2b

Browse Source 
Note: Blake2s code is not compiled yet
This commit is contained in:
Frank Denis 2014-09-13 13:14:56 -07:00
parent a7d38ef15d
commit 7dde13e1b4
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/libsodium/crypto_generichash/blake2/ref/blake2s-ref.c
View File

@ -146,10 +146,10 @@ static inline int blake2s_init0( blake2s_state *S )
int blake2s_init_param( blake2s_state *S, const blake2s_param *P ) int blake2s_init_param( blake2s_state *S, const blake2s_param *P )
{ {
size_t i; size_t i;
uint32_t *p; const uint32_t *p;
blake2s_init0( S ); blake2s_init0( S );
p = ( uint32_t * )( P ); p = ( const uint32_t * )( P );
/* IV XOR ParamBlock */ /* IV XOR ParamBlock */
for( i = 0; i < 8; ++i ) for( i = 0; i < 8; ++i )
@ -310,6 +310,9 @@ int blake2s_final( blake2s_state *S, uint8_t *out, uint8_t outlen )
uint8_t buffer[BLAKE2S_OUTBYTES]; uint8_t buffer[BLAKE2S_OUTBYTES];
int i; int i;
if( outlen > BLAKE2S_OUTBYTES ) {
return -1;
}
if( S->buflen > BLAKE2S_BLOCKBYTES ) if( S->buflen > BLAKE2S_BLOCKBYTES )
{ {
blake2s_increment_counter( S, BLAKE2S_BLOCKBYTES ); blake2s_increment_counter( S, BLAKE2S_BLOCKBYTES );
@ -350,7 +353,7 @@ int blake2s( uint8_t *out, const void *in, const void *key, const uint8_t outlen
if( blake2s_init( S, outlen ) < 0 ) return -1; if( blake2s_init( S, outlen ) < 0 ) return -1;
} }
blake2s_update( S, ( uint8_t * )in, inlen ); blake2s_update( S, ( const uint8_t * )in, inlen );
blake2s_final( S, out, outlen ); blake2s_final( S, out, outlen );
return 0; return 0;
} }