timoreo/olm
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'rav/clear_random_bufs'

Browse source
This commit is contained in:
Richard van der Hoff 2016-10-21 17:36:06 +01:00
commit d1a535861d
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/olm/outbound_group_session.h
View file

@ -96,7 +96,7 @@ size_t olm_init_outbound_group_session_random_length(
*/ */
size_t olm_init_outbound_group_session( size_t olm_init_outbound_group_session(
OlmOutboundGroupSession *session, OlmOutboundGroupSession *session,
uint8_t const * random, size_t random_length uint8_t *random, size_t random_length
); );
/** /**

13
src/outbound_group_session.c
View file

@ -154,20 +154,23 @@ size_t olm_init_outbound_group_session_random_length(
size_t olm_init_outbound_group_session( size_t olm_init_outbound_group_session(
OlmOutboundGroupSession *session, OlmOutboundGroupSession *session,
uint8_t const * random, size_t random_length uint8_t *random, size_t random_length
) { ) {
const uint8_t *random_ptr = random;
if (random_length < olm_init_outbound_group_session_random_length(session)) { if (random_length < olm_init_outbound_group_session_random_length(session)) {
/* Insufficient random data for new session */ /* Insufficient random data for new session */
session->last_error = OLM_NOT_ENOUGH_RANDOM; session->last_error = OLM_NOT_ENOUGH_RANDOM;
return (size_t)-1; return (size_t)-1;
} }
megolm_init(&(session->ratchet), random, 0); megolm_init(&(session->ratchet), random_ptr, 0);
random += MEGOLM_RATCHET_LENGTH; random_ptr += MEGOLM_RATCHET_LENGTH;
_olm_crypto_ed25519_generate_key(random, &(session->signing_key)); _olm_crypto_ed25519_generate_key(random_ptr, &(session->signing_key));
random += ED25519_RANDOM_LENGTH; random_ptr += ED25519_RANDOM_LENGTH;
_olm_unset(random, random_length);
return 0; return 0;
} }