diff options
author | manuroe <manu@matrix.org> | 2016-11-07 17:21:39 +0100 |
---|---|---|
committer | manuroe <manu@matrix.org> | 2016-11-07 17:21:39 +0100 |
commit | 5d1b66c350ac017613982f904b896750766654de (patch) | |
tree | a290c557e7881f7eb48cbdd568a4f3e43cb749c6 /include/olm/inbound_group_session.h | |
parent | 62f52806702b799b9e25e7cdf07be1c8a31325a2 (diff) | |
parent | f6c05be8c5d35e725a8a2ed5ad661398ac9f8cd2 (diff) |
Merge remote-tracking branch 'origin/master' into olmkit
Diffstat (limited to 'include/olm/inbound_group_session.h')
-rw-r--r-- | include/olm/inbound_group_session.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/olm/inbound_group_session.h b/include/olm/inbound_group_session.h index 59146c2..f8a0bc3 100644 --- a/include/olm/inbound_group_session.h +++ b/include/olm/inbound_group_session.h @@ -140,7 +140,8 @@ size_t olm_group_decrypt( uint8_t * message, size_t message_length, /* output */ - uint8_t * plaintext, size_t max_plaintext_length + uint8_t * plaintext, size_t max_plaintext_length, + uint32_t * message_index ); |