From d7dce6118dec2db0d13c27a032f17b7acf0648ea Mon Sep 17 00:00:00 2001
From: inso <insomniak.fr@gmaiL.com>
Date: Sun, 19 Feb 2017 23:19:51 +0100
Subject: [PATCH] Fix bugs in scrypt params handling
---
src/sakia/gui/dialogs/connection_cfg/model.py | 6 +++---
src/sakia/gui/dialogs/connection_cfg/view.py | 6 ++++++
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/sakia/gui/dialogs/connection_cfg/model.py b/src/sakia/gui/dialogs/connection_cfg/model.py
index 98fda103..5f1f05fb 100644
--- a/src/sakia/gui/dialogs/connection_cfg/model.py
+++ b/src/sakia/gui/dialogs/connection_cfg/model.py
@@ -36,9 +36,9 @@ class ConnectionConfigModel(QObject):
def set_scrypt_infos(self, salt, password, scrypt_params):
self.connection.salt = salt
- self.connection.N = scrypt_params.N
- self.connection.r = scrypt_params.r
- self.connection.p = scrypt_params.p
+ self.connection.scrypt_N = scrypt_params.N
+ self.connection.scrypt_r = scrypt_params.r
+ self.connection.scrypt_p = scrypt_params.p
self.connection.password = password
self.connection.pubkey = SigningKey(self.connection.salt, password, scrypt_params).pubkey
diff --git a/src/sakia/gui/dialogs/connection_cfg/view.py b/src/sakia/gui/dialogs/connection_cfg/view.py
index a75d56cd..22d221a7 100644
--- a/src/sakia/gui/dialogs/connection_cfg/view.py
+++ b/src/sakia/gui/dialogs/connection_cfg/view.py
@@ -47,9 +47,15 @@ class ConnectionConfigView(QDialog, Ui_ConnectionConfigurationDialog):
(2 ** 16, 32, 4),
(2 ** 18, 64, 8),
]
+ self.spin_n.blockSignals(True)
+ self.spin_r.blockSignals(True)
+ self.spin_p.blockSignals(True)
self.spin_n.setValue(strengths[index][0])
self.spin_r.setValue(strengths[index][1])
self.spin_p.setValue(strengths[index][2])
+ self.spin_n.blockSignals(False)
+ self.spin_r.blockSignals(False)
+ self.spin_p.blockSignals(False)
def handle_n_change(self, value):
spinbox = self.sender()
--
GitLab