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 /python/olm/__main__.py | |
| parent | c725a561a283f508e68516ded86d141214f5ea06 (diff) | |
| parent | f6c05be8c5d35e725a8a2ed5ad661398ac9f8cd2 (diff) | |
Merge remote-tracking branch 'origin/master' into pedroc/android_e2e_dev
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) |