tMerge branch 'master' of git://github.com/spesmilo/electrum - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit c0858f314f16162f39b3034af85d8be59be84e39
DIR parent cf5328b143331fcfa3d1ada3662e9cf72b9ea57d
HTML Author: ThomasV <thomasv@gitorious>
Date: Thu, 2 Jul 2015 08:48:53 +0200
Merge branch 'master' of git://github.com/spesmilo/electrum
Diffstat:
M lib/commands.py | 4 ++--
M lib/interface.py | 2 --
2 files changed, 2 insertions(+), 4 deletions(-)
---
DIR diff --git a/lib/commands.py b/lib/commands.py
t@@ -199,8 +199,8 @@ class Commands:
t = Transaction(tx)
t.deserialize()
if privkey:
- pubkey = bitcoin.public_key_from_private_key(sec)
- t.sign({pubkey:sec})
+ pubkey = bitcoin.public_key_from_private_key(privkey)
+ t.sign({pubkey:privkey})
else:
self.wallet.sign_transaction(t, self.password)
return t
DIR diff --git a/lib/interface.py b/lib/interface.py
t@@ -228,7 +228,6 @@ class TcpInterface(threading.Thread):
try:
x = x509.X509()
x.parse(cert)
- x.slow_parse()
except:
traceback.print_exc(file=sys.stderr)
self.print_error("wrong certificate")
t@@ -342,7 +341,6 @@ def check_cert(host, cert):
try:
x = x509.X509()
x.parse(cert)
- x.slow_parse()
except:
traceback.print_exc(file=sys.stdout)
return