Add two new test vectors for ed25519 key blinding.

- Also fix the vector producing script to work with python3.

1 files changed, 8 insertions, 4 deletions

diff --git a/src/test/ed25519_exts_ref.py b/src/test/ed25519_exts_ref.py
index dcc0a7c25a..abc9a1de7f 100644
--- a/src/test/ed25519_exts_ref.py
+++ b/src/test/ed25519_exts_ref.py
@@ -42,7 +42,7 @@ def blindESK(esk, param):
     s_prime = (s * mult) % ell
     k = esk[32:]
     assert(len(k) == 32)
-    k_prime = H("Derive temporary signing key hash input" + k)[:32]
+    k_prime = H(b"Derive temporary signing key hash input" + k)[:32]
     return encodeint(s_prime) + k_prime
 
 def blindPK(pk, param):
@@ -170,6 +170,8 @@ RAND_INPUTS = [
   '5c8eac469bb3f1b85bc7cd893f52dc42a9ab66f1b02b5ce6a68e9b175d3bb433',
   'eda433d483059b6d1ff8b7cfbd0fe406bfb23722c8f3c8252629284573b61b86',
   '4377c40431c30883c5fbd9bc92ae48d1ed8a47b81d13806beac5351739b5533d',
+  'c6bbcce615839756aed2cc78b1de13884dd3618f48367a17597a16c1cd7a290b',
+  'c6bbcce615839756aed2cc78b1de13884dd3618f48367a17597a16c1cd7a290b',
   'c6bbcce615839756aed2cc78b1de13884dd3618f48367a17597a16c1cd7a290b']
 
 # From pprint.pprint([ binascii.b2a_hex(os.urandom(32)) for _ in xrange(8) ])
@@ -181,7 +183,9 @@ BLINDING_PARAMS = [
   'b1fe79d1dec9bc108df69f6612c72812755751f21ecc5af99663b30be8b9081f',
   '81f1512b63ab5fb5c1711a4ec83d379c420574aedffa8c3368e1c3989a3a0084',
   '97f45142597c473a4b0e9a12d64561133ad9e1155fe5a9807fe6af8a93557818',
-  '3f44f6a5a92cde816635dfc12ade70539871078d2ff097278be2a555c9859cd0']
+  '3f44f6a5a92cde816635dfc12ade70539871078d2ff097278be2a555c9859cd0',
+  '0000000000000000000000000000000000000000000000000000000000000000',
+  '1111111111111111111111111111111111111111111111111111111111111111']
 
 PREFIX = "ED25519_"
 
@@ -193,9 +197,9 @@ def writeArray(name, array):
         if len(h) > 70:
             h1 = h[:70]
             h2 = h[70:]
-            print('  "{0}"\n      "{1}",'.format(h1,h2))
+            print('  "{0}"\n      "{1}",'.format(h1.decode('utf-8'),h2.decode('utf-8')))
         else:
-            print('  "{0}",'.format(h))
+            print('  "{0}",'.format(h.decode('utf-8')))
     print("};\n")
 
 def comment(text, initial="/**"):