summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/do-not-decode-decrypted-data1
-rw-r--r--src/leap/keymanager/openpgp.py14
-rw-r--r--src/leap/keymanager/tests/test_keymanager.py16
3 files changed, 17 insertions, 14 deletions
diff --git a/changes/do-not-decode-decrypted-data b/changes/do-not-decode-decrypted-data
new file mode 100644
index 00000000..a708be6e
--- /dev/null
+++ b/changes/do-not-decode-decrypted-data
@@ -0,0 +1 @@
+ o Do not decode decrypted data, return as str.
diff --git a/src/leap/keymanager/openpgp.py b/src/leap/keymanager/openpgp.py
index 4276b19f..950d022c 100644
--- a/src/leap/keymanager/openpgp.py
+++ b/src/leap/keymanager/openpgp.py
@@ -17,12 +17,10 @@
"""
Infrastructure for using OpenPGP keys in Key Manager.
"""
-import locale
import logging
import os
import re
import shutil
-import sys
import tempfile
from contextlib import closing
@@ -522,7 +520,7 @@ class OpenPGPScheme(EncryptionScheme):
return result.data
except errors.GPGError as e:
logger.error('Failed to decrypt: %s.' % str(e))
- raise error.EncryptError()
+ raise errors.EncryptError()
def decrypt(self, data, privkey, passphrase=None, verify=None):
"""
@@ -564,15 +562,7 @@ class OpenPGPScheme(EncryptionScheme):
'Failed to verify signature with key %s: %s' %
(verify.key_id, result.stderr))
- # XXX: this is the encoding used by gpg module
- # https://github.com/isislovecruft/python-gnupg/\
- # blob/master/gnupg/_meta.py#L121
- encoding = locale.getpreferredencoding()
- if encoding is None:
- encoding = sys.stdin.encoding
- if encoding is None:
- encoding = 'utf-8'
- return result.data.decode(encoding, 'replace')
+ return result.data
except errors.GPGError as e:
logger.error('Failed to decrypt: %s.' % str(e))
raise errors.DecryptError(str(e))
diff --git a/src/leap/keymanager/tests/test_keymanager.py b/src/leap/keymanager/tests/test_keymanager.py
index 67676e9c..e2558e45 100644
--- a/src/leap/keymanager/tests/test_keymanager.py
+++ b/src/leap/keymanager/tests/test_keymanager.py
@@ -118,9 +118,21 @@ class KeyManagerWithSoledadTestCase(BaseLeapTest):
Soledad._get_secrets_from_shared_db = Mock(return_value=None)
Soledad._put_secrets_in_shared_db = Mock(return_value=None)
+ class MockSharedDB(object):
+
+ get_doc = Mock(return_value=None)
+ put_doc = Mock()
+ lock = Mock(return_value=('atoken', 300))
+ unlock = Mock(return_value=True)
+
+ def __call__(self):
+ return self
+
+ Soledad._shared_db = MockSharedDB()
+
self._soledad = Soledad(
- "leap@leap.se",
- "123456",
+ u"leap@leap.se",
+ u"123456",
secrets_path=self.tempdir + "/secret.gpg",
local_db_path=self.tempdir + "/soledad.u1db",
server_url='',