summaryrefslogtreecommitdiff
path: root/src/leap
diff options
context:
space:
mode:
authorVictor Shyba <victor1984@riseup.net>2017-06-27 06:37:13 -0300
committerdrebs <drebs@leap.se>2017-07-18 15:22:23 -0300
commit74dae7251e2aa28f1887f36d47bcf9366557bbe6 (patch)
treeb3c75d9c012e2fe5cb065f906f50d955f0c6deb0 /src/leap
parent9a14e2bae39709402595326652083c2af05d452e (diff)
[refactor] move preamble module to common
This move allows server to use it on #8868 as described in #8890 -- Relates: #8890
Diffstat (limited to 'src/leap')
-rw-r--r--src/leap/soledad/client/_crypto.py7
-rw-r--r--src/leap/soledad/common/preamble.py (renamed from src/leap/soledad/client/_preamble.py)2
2 files changed, 6 insertions, 3 deletions
diff --git a/src/leap/soledad/client/_crypto.py b/src/leap/soledad/client/_crypto.py
index d0fb6e7f..998b70fa 100644
--- a/src/leap/soledad/client/_crypto.py
+++ b/src/leap/soledad/client/_crypto.py
@@ -86,8 +86,11 @@ from cryptography.hazmat.backends import default_backend
from zope.interface import implementer
-from ._preamble import InvalidPreambleException, decode_preamble, Preamble
-from ._preamble import ENC_SCHEME, ENC_METHOD, BLOB_SIGNATURE_MAGIC
+from leap.soledad.common.preamble import InvalidPreambleException
+from leap.soledad.common.preamble import decode_preamble
+from leap.soledad.common.preamble import Preamble
+from leap.soledad.common.preamble import ENC_SCHEME, ENC_METHOD
+from leap.soledad.common.preamble import BLOB_SIGNATURE_MAGIC
SECRET_LENGTH = 64
diff --git a/src/leap/soledad/client/_preamble.py b/src/leap/soledad/common/preamble.py
index 262d70ce..724923c5 100644
--- a/src/leap/soledad/client/_preamble.py
+++ b/src/leap/soledad/common/preamble.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# _preamble.py
+# preamble.py
# Copyright (C) 2017 LEAP Encryption Access Project
#
# This program is free software: you can redistribute it and/or modify