diff options
| author | Samuel Neves <sneves@dei.uc.pt> | 2014-01-14 22:59:52 +0400 |
|---|---|---|
| committer | Samuel Neves <sneves@dei.uc.pt> | 2014-01-14 22:59:52 +0400 |
| commit | 802c795b4340ff69e2e14cdd326565d0a8372cf4 (patch) | |
| tree | 89f030c22c0f24c87f291df2bcddfd078fe08a28 | |
| parent | fb714d2c830ec524bd3cbb5a45fe70fd90fe5c84 (diff) | |
Fix BLAKE2sp and BLAKEbp's inner_length bug.
| -rw-r--r-- | ref/blake2bp-ref.c | 4 | ||||
| -rw-r--r-- | ref/blake2sp-ref.c | 4 | ||||
| -rw-r--r-- | sse/blake2bp.c | 4 | ||||
| -rw-r--r-- | sse/blake2sp.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/ref/blake2bp-ref.c b/ref/blake2bp-ref.c index 2e223f2..b50f21d 100644 --- a/ref/blake2bp-ref.c +++ b/ref/blake2bp-ref.c @@ -35,7 +35,7 @@ static inline int blake2bp_init_leaf( blake2b_state *S, uint8_t outlen, uint8_t store32( &P->leaf_length, 0 ); store64( &P->node_offset, offset ); P->node_depth = 0; - P->inner_length = outlen; + P->inner_length = BLAKE2B_OUTBYTES; memset( P->reserved, 0, sizeof( P->reserved ) ); memset( P->salt, 0, sizeof( P->salt ) ); memset( P->personal, 0, sizeof( P->personal ) ); @@ -52,7 +52,7 @@ static inline int blake2bp_init_root( blake2b_state *S, uint8_t outlen, uint8_t store32( &P->leaf_length, 0 ); store64( &P->node_offset, 0 ); P->node_depth = 1; - P->inner_length = outlen; + P->inner_length = BLAKE2B_OUTBYTES; memset( P->reserved, 0, sizeof( P->reserved ) ); memset( P->salt, 0, sizeof( P->salt ) ); memset( P->personal, 0, sizeof( P->personal ) ); diff --git a/ref/blake2sp-ref.c b/ref/blake2sp-ref.c index 44cfb3b..230187e 100644 --- a/ref/blake2sp-ref.c +++ b/ref/blake2sp-ref.c @@ -34,7 +34,7 @@ static inline int blake2sp_init_leaf( blake2s_state *S, uint8_t outlen, uint8_t store32( &P->leaf_length, 0 ); store48( P->node_offset, offset ); P->node_depth = 0; - P->inner_length = outlen; + P->inner_length = BLAKE2S_OUTBYTES; memset( P->salt, 0, sizeof( P->salt ) ); memset( P->personal, 0, sizeof( P->personal ) ); return blake2s_init_param( S, P ); @@ -50,7 +50,7 @@ static inline int blake2sp_init_root( blake2s_state *S, uint8_t outlen, uint8_t store32( &P->leaf_length, 0 ); store48( P->node_offset, 0ULL ); P->node_depth = 1; - P->inner_length = outlen; + P->inner_length = BLAKE2S_OUTBYTES; memset( P->salt, 0, sizeof( P->salt ) ); memset( P->personal, 0, sizeof( P->personal ) ); return blake2s_init_param( S, P ); diff --git a/sse/blake2bp.c b/sse/blake2bp.c index ddcd074..644f402 100644 --- a/sse/blake2bp.c +++ b/sse/blake2bp.c @@ -35,7 +35,7 @@ static inline int blake2bp_init_leaf( blake2b_state *S, uint8_t outlen, uint8_t P->leaf_length = 0; P->node_offset = offset; P->node_depth = 0; - P->inner_length = outlen; + P->inner_length = BLAKE2B_OUTBYTES; memset( P->reserved, 0, sizeof( P->reserved ) ); memset( P->salt, 0, sizeof( P->salt ) ); memset( P->personal, 0, sizeof( P->personal ) ); @@ -52,7 +52,7 @@ static inline int blake2bp_init_root( blake2b_state *S, uint8_t outlen, uint8_t P->leaf_length = 0; P->node_offset = 0; P->node_depth = 1; - P->inner_length = outlen; + P->inner_length = BLAKE2B_OUTBYTES; memset( P->reserved, 0, sizeof( P->reserved ) ); memset( P->salt, 0, sizeof( P->salt ) ); memset( P->personal, 0, sizeof( P->personal ) ); diff --git a/sse/blake2sp.c b/sse/blake2sp.c index 658bd5f..a417576 100644 --- a/sse/blake2sp.c +++ b/sse/blake2sp.c @@ -34,7 +34,7 @@ static inline int blake2sp_init_leaf( blake2s_state *S, uint8_t outlen, uint8_t P->leaf_length = 0; store48( P->node_offset, offset ); P->node_depth = 0; - P->inner_length = outlen; + P->inner_length = BLAKE2S_OUTBYTES; memset( P->salt, 0, sizeof( P->salt ) ); memset( P->personal, 0, sizeof( P->personal ) ); return blake2s_init_param( S, P ); @@ -50,7 +50,7 @@ static inline int blake2sp_init_root( blake2s_state *S, uint8_t outlen, uint8_t P->leaf_length = 0; store48( P->node_offset, 0ULL ); P->node_depth = 1; - P->inner_length = outlen; + P->inner_length = BLAKE2S_OUTBYTES; memset( P->salt, 0, sizeof( P->salt ) ); memset( P->personal, 0, sizeof( P->personal ) ); return blake2s_init_param( S, P ); |