aboutsummaryrefslogtreecommitdiff
path: root/python/olm/__main__.py
diff options
context:
space:
mode:
authorJ08nY <johny@neuromancer.sk>2017-04-02 00:35:55 +0200
committerRichard van der Hoff <richard@matrix.org>2017-04-04 10:45:11 +0100
commit001dc1edaa4c5306fbb7c625202788458dadeafa (patch)
treeef9201b107d717c34b19f3fb9d4dca56d0fa32fe /python/olm/__main__.py
parentbb05b5687f12782cc2e87ffdf2dc0dfe0f6dcfb6 (diff)
Python: Switch to a more general os.urandom for randomness source
Signed-off-by: Jan Jancar <johny@neuromancer.sk>
Diffstat (limited to 'python/olm/__main__.py')
-rwxr-xr-xpython/olm/__main__.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/python/olm/__main__.py b/python/olm/__main__.py
index 5f78f76..cb7f164 100755
--- a/python/olm/__main__.py
+++ b/python/olm/__main__.py
@@ -10,11 +10,13 @@ import yaml
from . import *
+
def read_base64_file(filename):
"""Read a base64 file, dropping any CR/LF characters"""
with open(filename, "rb") as f:
return f.read().translate(None, "\r\n")
+
def build_arg_parser():
parser = argparse.ArgumentParser()
parser.add_argument("--key", help="Account encryption key", default="")
@@ -291,7 +293,6 @@ def build_arg_parser():
default=sys.stdout)
group_decrypt.set_defaults(func=do_group_decrypt)
-
export_inbound_group = commands.add_parser(
"export_inbound_group",
help="Export the keys for an inbound group session",