diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2016-05-26 13:27:23 +0100 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2016-05-26 13:27:23 +0100 |
| commit | 09b8c3d7bc9e62760ed17575159de655e90b399b (patch) | |
| tree | 88c0554aad2a2adaf540b4a3bbfa88a0171e2602 /src/outbound_group_session.c | |
| parent | bfeb554e8699c5cb90cab14dc74e15c30f963d74 (diff) | |
| parent | 708fddd747789a101123b09b67c064b119db8873 (diff) | |
Merge remote-tracking branch 'matrix/master'
Diffstat (limited to 'src/outbound_group_session.c')
| -rw-r--r-- | src/outbound_group_session.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/outbound_group_session.c b/src/outbound_group_session.c index 9b2298a..2a6c220 100644 --- a/src/outbound_group_session.c +++ b/src/outbound_group_session.c @@ -187,7 +187,7 @@ static size_t raw_message_length( mac_length = megolm_cipher->ops->mac_length(megolm_cipher); return _olm_encode_group_message_length( - GROUP_SESSION_ID_LENGTH, session->ratchet.counter, + session->ratchet.counter, ciphertext_length, mac_length); } @@ -220,7 +220,6 @@ static size_t _encrypt( */ message_length = _olm_encode_group_message( OLM_PROTOCOL_VERSION, - session->session_id, GROUP_SESSION_ID_LENGTH, session->ratchet.counter, ciphertext_length, buffer, |