diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-10-23 11:30:40 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-10-23 11:30:40 -0300 |
| commit | f50f192cd1cf6133084bafb9921ef20b48cbd37a (patch) | |
| tree | 2f22bf9b659960799d0f3e17d423bd2bf9eec9a3 | |
| parent | f53f40ba3b54bb8fdc418bf35d0180e26fbfd209 (diff) | |
| parent | 90dc71906db5e611fc1aeabcd16be24c610f67c6 (diff) | |
Merge remote-tracking branch 'ivan/bug/4001_support-non-ascii-passwords' into develop
| -rw-r--r-- | client/changes/bug-4001_support-non-ascii-passwords | 1 | ||||
| -rw-r--r-- | client/src/leap/soledad/client/__init__.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/client/changes/bug-4001_support-non-ascii-passwords b/client/changes/bug-4001_support-non-ascii-passwords new file mode 100644 index 00000000..1288b4e3 --- /dev/null +++ b/client/changes/bug-4001_support-non-ascii-passwords @@ -0,0 +1 @@ + o Support non-ascii passwords. Closes #4001. diff --git a/client/src/leap/soledad/client/__init__.py b/client/src/leap/soledad/client/__init__.py index 13a3b68f..e38aa939 100644 --- a/client/src/leap/soledad/client/__init__.py +++ b/client/src/leap/soledad/client/__init__.py @@ -1118,7 +1118,7 @@ class Soledad(object): doc='The secret used for symmetric encryption.') def _get_passphrase(self): - return self._passphrase + return self._passphrase.decode("UTF-8") passphrase = property( _get_passphrase, |