Completelly switch to Key Manager for crypto.

This removes all GPG wrapper that was left and includes Key Manager to take
care of all crypto stuff.

3 files changed, 19 insertions, 19 deletions

diff --git a/src/leap/soledad/tests/__init__.py b/src/leap/soledad/tests/__init__.py
index 28114391..dac27a29 100644
--- a/src/leap/soledad/tests/__init__.py
+++ b/src/leap/soledad/tests/__init__.py
@@ -36,7 +36,7 @@ class BaseSoledadTest(BaseLeapTest):
         self._soledad = self._soledad_instance(user=self.email)
         self._soledad._init_dirs()
         #self._soledad._gpg.import_keys(PUBLIC_KEY)
-        self._soledad._crypto = SoledadCrypto(self.gnupg_home)
+        self._soledad._crypto = SoledadCrypto(self._soledad)
         if not self._soledad._has_symkey():
             self._soledad._gen_symkey()
         self._soledad._load_symkey()
diff --git a/src/leap/soledad/tests/test_crypto.py b/src/leap/soledad/tests/test_crypto.py
index f762437a..039d2f3c 100644
--- a/src/leap/soledad/tests/test_crypto.py
+++ b/src/leap/soledad/tests/test_crypto.py
@@ -77,7 +77,7 @@ class RecoveryDocumentTestCase(BaseSoledadTest):
         rd = self._soledad.export_recovery_document(None)
         self.assertEqual(
             {
-                'user': self._soledad._user,
+                'address': self._soledad._address,
                 'symkey': self._soledad._symkey
             },
             json.loads(rd),
@@ -89,10 +89,10 @@ class RecoveryDocumentTestCase(BaseSoledadTest):
         self.assertEqual(True,
                          self._soledad._crypto.is_encrypted_sym(rd))
         data = {
-            'user': self._soledad._user,
+            'address': self._soledad._address,
             'symkey': self._soledad._symkey,
         }
-        raw_data = json.loads(str(self._soledad._crypto.decrypt(
+        raw_data = json.loads(str(self._soledad._crypto.decrypt_sym(
             rd,
             passphrase='123456')))
         self.assertEqual(
@@ -111,10 +111,10 @@ class RecoveryDocumentTestCase(BaseSoledadTest):
         gnupg_home = self.gnupg_home = "%s/gnupg2" % self.tempdir
         s = self._soledad_instance(user='anotheruser@leap.se', prefix='/2')
         s._init_dirs()
-        s._crypto = SoledadCrypto(gnupg_home)
+        s._crypto = SoledadCrypto(s)
         s.import_recovery_document(rd, None)
-        self.assertEqual(self._soledad._user,
-                         s._user, 'Failed setting user email.')
+        self.assertEqual(self._soledad._address,
+                         s._address, 'Failed setting user email.')
         self.assertEqual(self._soledad._symkey,
                          s._symkey,
                          'Failed settinng secret for symmetric encryption.')
@@ -124,10 +124,10 @@ class RecoveryDocumentTestCase(BaseSoledadTest):
         gnupg_home = self.gnupg_home = "%s/gnupg2" % self.tempdir
         s = self._soledad_instance(user='anotheruser@leap.se', prefix='3')
         s._init_dirs()
-        s._crypto = SoledadCrypto(gnupg_home)
+        s._crypto = SoledadCrypto(s)
         s.import_recovery_document(rd, '123456')
-        self.assertEqual(self._soledad._user,
-                         s._user, 'Failed setting user email.')
+        self.assertEqual(self._soledad._address,
+                         s._address, 'Failed setting user email.')
         self.assertEqual(self._soledad._symkey,
                          s._symkey,
                          'Failed settinng secret for symmetric encryption.')
@@ -138,7 +138,7 @@ class CryptoMethodsTestCase(BaseSoledadTest):
     def test__gen_symkey(self):
         sol = self._soledad_instance(user='user@leap.se', prefix='/3')
         sol._init_dirs()
-        sol._crypto = SoledadCrypto("%s/3/gnupg" % self.tempdir)
+        sol._crypto = SoledadCrypto(sol)
         self.assertFalse(sol._has_symkey(), "Should not have a symkey at "
                                             "this point")
         sol._gen_symkey()
@@ -147,7 +147,7 @@ class CryptoMethodsTestCase(BaseSoledadTest):
     def test__has_keys(self):
         sol = self._soledad_instance(user='leap@leap.se', prefix='/5')
         sol._init_dirs()
-        sol._crypto = SoledadCrypto("%s/5/gnupg" % self.tempdir)
+        sol._crypto = SoledadCrypto(sol)
         self.assertFalse(sol._has_keys())
         sol._gen_symkey()
         self.assertTrue(sol._has_keys())
diff --git a/src/leap/soledad/tests/test_soledad.py b/src/leap/soledad/tests/test_soledad.py
index b849c310..bbe9ad4b 100644
--- a/src/leap/soledad/tests/test_soledad.py
+++ b/src/leap/soledad/tests/test_soledad.py
@@ -50,7 +50,7 @@ class AuxMethodsTestCase(BaseSoledadTest):
     def test__init_db(self):
         sol = self._soledad_instance()
         sol._init_dirs()
-        sol._crypto = SoledadCrypto(self.tempdir+'/gnupg')
+        sol._crypto = SoledadCrypto(sol)
         #self._soledad._gpg.import_keys(PUBLIC_KEY)
         if not sol._has_symkey():
             sol._gen_symkey()
@@ -63,7 +63,7 @@ class AuxMethodsTestCase(BaseSoledadTest):
         """
         Test if configuration defaults point to the correct place.
         """
-        sol = Soledad(user='leap@leap.se', passphrase='123', bootstrap=False)
+        sol = Soledad('leap@leap.se', passphrase='123', bootstrap=False)
         self.assertTrue(bool(re.match(
             '.*/\.config/leap/soledad/gnupg', sol._config.get_gnupg_home())))
         self.assertTrue(bool(re.match(
@@ -83,7 +83,7 @@ class AuxMethodsTestCase(BaseSoledadTest):
         # we use regexp match here because HOME environment variable is
         # changed by the BaseLeapTest class but BaseConfig does not capture
         # that change.
-        sol = Soledad(user='leap@leap.se', passphrase='123', bootstrap=False)
+        sol = Soledad('leap@leap.se', passphrase='123', bootstrap=False)
         self.assertTrue(bool(re.match(
             '.*/\.config/leap/soledad/gnupg', sol._config.get_gnupg_home())))
         self.assertTrue(bool(re.match(
@@ -114,8 +114,8 @@ class AuxMethodsTestCase(BaseSoledadTest):
         f.write(json.dumps(config_values))
         f.close()
         sol = Soledad(
-            user='leap@leap.se',
-            passphrase='123', 
+            'leap@leap.se',
+            passphrase='123',
             bootstrap=False,
             config_path=tmpfile)
         self.assertEqual('value_1', sol._config.get_gnupg_home())
@@ -131,8 +131,8 @@ class AuxMethodsTestCase(BaseSoledadTest):
         # changed by the BaseLeapTest class but BaseConfig does not capture
         # that change.
         sol = Soledad(
-            user='leap@leap.se',
-            passphrase='123', 
+            'leap@leap.se',
+            passphrase='123',
             bootstrap=False,
             gnupg_home='value_4',
             secret_path='value_3',