diff options
| author | pedroGitt <pedro.contreiras@amdocs.com> | 2016-11-23 00:04:58 +0100 |
|---|---|---|
| committer | pedroGitt <pedro.contreiras@amdocs.com> | 2016-11-23 00:04:58 +0100 |
| commit | 7a6897642baa8fc5d9d9f14c80fc4f201cfe2173 (patch) | |
| tree | 9325a7d7d3ac40747f49af22378dcf9bc5c0dd0b /include/olm/inbound_group_session.h | |
| parent | c725a561a283f508e68516ded86d141214f5ea06 (diff) | |
| parent | f6c05be8c5d35e725a8a2ed5ad661398ac9f8cd2 (diff) | |
Merge remote-tracking branch 'origin/master' into pedroc/android_e2e_dev
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 ); |