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 /python/olm/inbound_group_session.py | |
parent | 62f52806702b799b9e25e7cdf07be1c8a31325a2 (diff) | |
parent | f6c05be8c5d35e725a8a2ed5ad661398ac9f8cd2 (diff) |
Merge remote-tracking branch 'origin/master' into olmkit
Diffstat (limited to 'python/olm/inbound_group_session.py')
-rw-r--r-- | python/olm/inbound_group_session.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/python/olm/inbound_group_session.py b/python/olm/inbound_group_session.py index d5547fd..27a569c 100644 --- a/python/olm/inbound_group_session.py +++ b/python/olm/inbound_group_session.py @@ -43,6 +43,7 @@ inbound_group_session_function( lib.olm_group_decrypt, c_void_p, c_size_t, # message c_void_p, c_size_t, # plaintext + POINTER(c_uint32), # message_index ) inbound_group_session_function(lib.olm_inbound_group_session_id_length) @@ -82,11 +83,14 @@ class InboundGroupSession(object): ) plaintext_buffer = create_string_buffer(max_plaintext_length) message_buffer = create_string_buffer(message) + + message_index = c_uint32() plaintext_length = lib.olm_group_decrypt( self.ptr, message_buffer, len(message), - plaintext_buffer, max_plaintext_length + plaintext_buffer, max_plaintext_length, + byref(message_index) ) - return plaintext_buffer.raw[:plaintext_length] + return plaintext_buffer.raw[:plaintext_length], message_index def session_id(self): id_length = lib.olm_inbound_group_session_id_length(self.ptr) |