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/__main__.py | |
parent | 62f52806702b799b9e25e7cdf07be1c8a31325a2 (diff) | |
parent | f6c05be8c5d35e725a8a2ed5ad661398ac9f8cd2 (diff) |
Merge remote-tracking branch 'origin/master' into olmkit
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) |