diff options
author | Kurt Roeckx <kurt@roeckx.be> | 2016-03-11 01:06:51 +0100 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2016-03-11 10:39:10 -0500 |
commit | a57410899af60eff20dfe932283775edc2603c2a (patch) | |
tree | 31c008cf4f9ea5d804a00353e82d77fbecb1158e /crypto/blake2/blake2s.c | |
parent | 208527a75dd9584e2715c0eebcfad8c730d0dfae (diff) |
Save leaf_node and node_offset as character array
They are not numbers in the machine byte order.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto/blake2/blake2s.c')
-rw-r--r-- | crypto/blake2/blake2s.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/blake2/blake2s.c b/crypto/blake2/blake2s.c index eee615d944..75be06a79e 100644 --- a/crypto/blake2/blake2s.c +++ b/crypto/blake2/blake2s.c @@ -70,7 +70,7 @@ static ossl_inline void blake2s_init0(BLAKE2S_CTX *S) /* init2 xors IV with input parameter block */ static void blake2s_init_param(BLAKE2S_CTX *S, const BLAKE2S_PARAM *P) { - const uint32_t *p = (const uint32_t *)(P); + const uint8_t *p = (const uint8_t *)(P); size_t i; /* The param struct is carefully hand packed, and should be 32 bytes on @@ -79,7 +79,7 @@ static void blake2s_init_param(BLAKE2S_CTX *S, const BLAKE2S_PARAM *P) blake2s_init0(S); /* IV XOR ParamBlock */ for(i = 0; i < 8; ++i) { - S->h[i] ^= load32(&p[i]); + S->h[i] ^= load32(&p[i*4]); } } @@ -92,8 +92,8 @@ int BLAKE2s_Init(BLAKE2S_CTX *c) P->key_length = 0; P->fanout = 1; P->depth = 1; - store32(&P->leaf_length, 0); - store48(&P->node_offset, 0); + store32(P->leaf_length, 0); + store48(P->node_offset, 0); P->node_depth = 0; P->inner_length = 0; memset(P->salt, 0, sizeof(P->salt)); |