Merge tag '0.3.5' into debian

Tag leap.keymanager version 0.3.5

2 files changed, 12 insertions, 2 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 8371498..dc89742 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+0.3.5 Nov 1:
+  o Return unicode decrypted text to avoid encoding issues. Related to
+    #4000.
+
 0.3.4 Oct 18:
   o Add option to choose cipher and digest algorithms when signing and
     encrypting. Closes #4030.
diff --git a/src/leap/keymanager/openpgp.py b/src/leap/keymanager/openpgp.py
index 6412331..8ec8639 100644
--- a/src/leap/keymanager/openpgp.py
+++ b/src/leap/keymanager/openpgp.py
@@ -26,6 +26,7 @@ import os
 import re
 import shutil
 import tempfile
+import locale
 
 from gnupg import GPG
 from gnupg.gnupg import GPGUtilities
@@ -482,7 +483,7 @@ class OpenPGPScheme(EncryptionScheme):
         :type verify: OpenPGPKey
 
         :return: The decrypted data.
-        :rtype: str
+        :rtype: unicode
 
         @raise InvalidSignature: Raised if unable to verify the signature with
             C{verify} key.
@@ -504,7 +505,12 @@ class OpenPGPScheme(EncryptionScheme):
                     raise errors.InvalidSignature(
                         'Failed to verify signature with key %s: %s' %
                         (verify.key_id, stderr))
-            return result.data
+
+            # XXX: this is the encoding used by gpg module
+            # https://github.com/isislovecruft/python-gnupg/\
+            #   blob/master/gnupg/_meta.py#L121
+            encoding = locale.getpreferredencoding()
+            return result.data.decode(encoding, 'replace')
 
     def is_encrypted(self, data):
         """