From 1a6e41cec8ac862ecde3a2647414befc775954e0 Mon Sep 17 00:00:00 2001 From: ThomasV Date: Fri, 18 Aug 2017 07:21:53 +0200 Subject: [PATCH] python3 updates --- lib/interface.py | 3 +++ lib/keystore.py | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/interface.py b/lib/interface.py index 83a10713..954017fd 100644 --- a/lib/interface.py +++ b/lib/interface.py @@ -175,6 +175,9 @@ class TcpConnection(threading.Thread, util.PrintError): cert_reqs=ssl.CERT_REQUIRED, ca_certs=(temporary_path if is_new else cert_path), do_handshake_on_connect=True) + except socket.timeout: + self.print_error('timeout') + return except ssl.SSLError as e: self.print_error("SSL error:", e) if e.errno != 1: diff --git a/lib/keystore.py b/lib/keystore.py index 7897af13..94fd30c1 100644 --- a/lib/keystore.py +++ b/lib/keystore.py @@ -356,7 +356,8 @@ class Old_KeyStore(Deterministic_KeyStore): def add_seed(self, seedphrase): Deterministic_KeyStore.add_seed(self, seedphrase) - self.mpk = self.mpk_from_seed(self.seed) + s = self.get_hex_seed(None) + self.mpk = self.mpk_from_seed(s) def add_master_public_key(self, mpk): self.mpk = mpk @@ -477,7 +478,7 @@ class Old_KeyStore(Deterministic_KeyStore): if new_password == '': new_password = None if self.has_seed(): - decoded = self.get_hex_seed(old_password) + decoded = pw_decode(self.seed, old_password) self.seed = pw_encode(decoded, new_password)