LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-09-05 05:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: handle blank passphrase properly

Browse source
This commit is contained in:
ThomasV 2015-08-19 10:20:33 +02:00
parent 2996ec927f
commit 425cc4d258
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
plugins/trezor.py
View file

@ -628,7 +628,7 @@ class TrezorQtHandler:
def passphrase_dialog(self): def passphrase_dialog(self):
if type(self.win) is ElectrumWindow: if type(self.win) is ElectrumWindow:
passphrase = self.win.password_dialog(_("Please enter your Trezor passphrase")) 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: else:
assert type(self.win) is InstallWizard assert type(self.win) is InstallWizard
from electrum_gui.qt.password_dialog import make_password_dialog, run_password_dialog from electrum_gui.qt.password_dialog import make_password_dialog, run_password_dialog
@ -640,9 +640,7 @@ class TrezorQtHandler:
QMessageBox.critical(None, _('Error'), _("Password request canceled"), _('OK')) QMessageBox.critical(None, _('Error'), _("Password request canceled"), _('OK'))
self.passphrase = None self.passphrase = None
else: else:
if passphrase is None: self.passphrase = unicodedata.normalize('NFKD', unicode(passphrase)) if passphrase emse ''
passphrase = '' # Even blank string is valid Trezor passphrase
self.passphrase = unicodedata.normalize('NFKD', unicode(passphrase))
self.done.set() self.done.set()
def message_dialog(self): def message_dialog(self):