Skip to content

Commit d6ee32d

Browse files
committed
fix py3, which I always mess up
1 parent 23dfe82 commit d6ee32d

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

setup.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ def do(setup_statements, statement):
5353

5454
for curve in ["NIST192p", "NIST224p", "NIST256p", "SECP256k1",
5555
"NIST384p", "NIST521p"]:
56-
S1 = "import ecdsa"
57-
S2 = "sk = ecdsa.SigningKey.generate(ecdsa.%s)" % curve
58-
S3 = "msg = 'msg'"
56+
S1 = "from ecdsa import six, SigningKey, %s" % curve
57+
S2 = "sk = SigningKey.generate(%s)" % curve
58+
S3 = "msg = six.b('msg')"
5959
S4 = "sig = sk.sign(msg)"
6060
S5 = "vk = sk.get_verifying_key()"
6161
S6 = "vk.verify(sig, msg)"
@@ -67,9 +67,10 @@ def do(setup_statements, statement):
6767
sign = do([S1,S2,S3], S4)
6868
verf = do([S1,S2,S3,S4,S5], S6)
6969
import ecdsa
70-
sig = ecdsa.SigningKey.generate(getattr(ecdsa, curve)).sign("msg")
71-
print "%9s: siglen=%3d, keygen=%.3fs, sign=%.3fs, verify=%.3fs" \
72-
% (curve, len(sig), keygen, sign, verf)
70+
c = getattr(ecdsa, curve)
71+
sig = ecdsa.SigningKey.generate(c).sign(ecdsa.six.b("msg"))
72+
print("%9s: siglen=%3d, keygen=%.3fs, sign=%.3fs, verify=%.3fs" \
73+
% (curve, len(sig), keygen, sign, verf))
7374

7475
commands["speed"] = Speed
7576

0 commit comments

Comments
 (0)