tfix: handle blank passphrase properly - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 425cc4d258ef994db72adcfbb4a66b9922325019
DIR parent 2996ec927f9313bc4a603b50cf38b6fb53998718
HTML Author: ThomasV <thomasv@gitorious>
Date: Wed, 19 Aug 2015 10:20:33 +0200
fix: handle blank passphrase properly
Diffstat:
M plugins/trezor.py | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
---
DIR diff --git a/plugins/trezor.py b/plugins/trezor.py
t@@ -628,7 +628,7 @@ class TrezorQtHandler:
def passphrase_dialog(self):
if type(self.win) is ElectrumWindow:
passphrase = self.win.password_dialog(_("Please enter your Trezor passphrase"))
- self.passphrase = unicodedata.normalize('NFKD', unicode(passphrase))
+ self.passphrase = unicodedata.normalize('NFKD', unicode(passphrase)) if passphrase else ''
else:
assert type(self.win) is InstallWizard
from electrum_gui.qt.password_dialog import make_password_dialog, run_password_dialog
t@@ -640,9 +640,7 @@ class TrezorQtHandler:
QMessageBox.critical(None, _('Error'), _("Password request canceled"), _('OK'))
self.passphrase = None
else:
- if passphrase is None:
- passphrase = '' # Even blank string is valid Trezor passphrase
- self.passphrase = unicodedata.normalize('NFKD', unicode(passphrase))
+ self.passphrase = unicodedata.normalize('NFKD', unicode(passphrase)) if passphrase emse ''
self.done.set()
def message_dialog(self):