diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2016-10-21 09:57:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-21 09:57:42 +0100 |
| commit | 5a98012c0d3951d2d08e9922ee682fbdecc68f0c (patch) | |
| tree | f4510135c054c28f2366119136c97ae024556497 /python/olm/__main__.py | |
| parent | 65b334531754d9decf485975ffd2f9591bc80e84 (diff) | |
| parent | 9a8d2d15d97dc17d8f33b7d45b0fefc1267b57c4 (diff) | |
Merge pull request #31 from matrix-org/markjh/groupmessageindex
Return the message index when decrypting group messages.
Diffstat (limited to 'python/olm/__main__.py')
| -rwxr-xr-x | python/olm/__main__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/python/olm/__main__.py b/python/olm/__main__.py index cf9158d..eb76301 100755 --- a/python/olm/__main__.py +++ b/python/olm/__main__.py @@ -328,7 +328,7 @@ def do_group_decrypt(args): session = InboundGroupSession() session.unpickle(args.key, read_base64_file(args.session_file)) message = args.message_file.read() - plaintext = session.decrypt(message) + plaintext, message_index = session.decrypt(message) with open(args.session_file, "wb") as f: f.write(session.pickle(args.key)) args.plaintext_file.write(plaintext) |