diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2014-01-17 14:53:10 -0300 | 
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2014-01-17 14:53:10 -0300 | 
| commit | fba576b3b4bcad5f701144736336872968b52e3b (patch) | |
| tree | c164f7207c809e3c614306145ef844143971af9c /src | |
| parent | 2631d418233e31dd9dfd4d97734372cb67d09951 (diff) | |
Do not decode decrypted data, return as str.
Diffstat (limited to 'src')
| -rw-r--r-- | src/leap/keymanager/openpgp.py | 10 | 
1 files changed, 1 insertions, 9 deletions
| diff --git a/src/leap/keymanager/openpgp.py b/src/leap/keymanager/openpgp.py index 4276b19f..961e1ed3 100644 --- a/src/leap/keymanager/openpgp.py +++ b/src/leap/keymanager/openpgp.py @@ -564,15 +564,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)) | 
