diff options
| author | drebs <drebs@leap.se> | 2013-04-23 10:22:05 -0300 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2013-04-23 10:22:05 -0300 |
| commit | b48f000e311daf543a8b8f776c5438725485bffd (patch) | |
| tree | 6872e00de2e9ae749cec285569d497c0739e32cb /src/leap/soledad/tests/test_soledad.py | |
| parent | 23e1a6404d31070364654b8138cfe21f07239974 (diff) | |
Separate crypto-related stuff from Soledad class.
This creates a SoledadCrypto object that should encapsulate everything related
to crypto in Soledad.
Also, replace hmac for sha256 when creating hashes.
Diffstat (limited to 'src/leap/soledad/tests/test_soledad.py')
| -rw-r--r-- | src/leap/soledad/tests/test_soledad.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/leap/soledad/tests/test_soledad.py b/src/leap/soledad/tests/test_soledad.py index 61d131f1..b849c310 100644 --- a/src/leap/soledad/tests/test_soledad.py +++ b/src/leap/soledad/tests/test_soledad.py @@ -32,6 +32,7 @@ except ImportError: from leap.soledad.tests import BaseSoledadTest from leap.soledad import Soledad +from leap.soledad.crypto import SoledadCrypto class AuxMethodsTestCase(BaseSoledadTest): @@ -49,7 +50,7 @@ class AuxMethodsTestCase(BaseSoledadTest): def test__init_db(self): sol = self._soledad_instance() sol._init_dirs() - sol._gpg = self._gpgwrapper_instance() + sol._crypto = SoledadCrypto(self.tempdir+'/gnupg') #self._soledad._gpg.import_keys(PUBLIC_KEY) if not sol._has_symkey(): sol._gen_symkey() |