Added JSON encoded test vectors

poc/CPace_coffee.sage

@@ -1,5 +1,4 @@
 import sys
-import base64
 
 sys.path.append("sagelib")
 
@@ -101,10 +100,10 @@ def output_coffee_invalid_point_test_cases(G, file = sys.stdout):
     print ("~~~\n", file = file)
 
     dict_valid = {}
-    dict_valid["s"] = base64.b64encode(y).decode('ascii')
-    dict_valid["X"] = base64.b64encode(X).decode('ascii')
-    dict_valid["G.scalar_mult(s,decode(X))"] = base64.b64encode(Z).decode('ascii')
-    dict_valid["G.scalar_mult_vfy(s,X)"] = base64.b64encode(K).decode('ascii')
+    dict_valid["s"] = list(y)
+    dict_valid["X"] = list(X)
+    dict_valid["G.scalar_mult(s,decode(X))"] = list(Z)
+    dict_valid["G.scalar_mult_vfy(s,X)"] = list(K)
 
     result_dict["Valid"] = dict_valid
 
@@ -128,7 +127,14 @@ def output_coffee_invalid_point_test_cases(G, file = sys.stdout):
     print ("    G.scalar_mult_vfy(s,Y_i1) = G.scalar_mult_vfy(s,Y_i2) = G.I", file = file)
     print ("~~~\n", file = file)    
 
-    result_dict["Invalid Y"] = base64.b64encode(Y_inv1).decode('ascii') 
+    result_dict["Invalid Y1"] = list(Y_inv1)
+    result_dict["Invalid Y2"] = list(G.I)
+
+    print ("\n####  Testvectors as JSON file encoded as BASE64\n", file=file)
+    print ("~~~", file=file)
+    tv_output_python_dictionary_as_json_base64(result_dict,line_prefix = "    ",file=file)
+    print ("~~~\n", file=file)
+
 
     return result_dict
 

poc/CPace_string_utils.sage

@@ -1,3 +1,5 @@
+import base64
+import json
 import sys
 
 def ByteArrayToInteger(k,numBytes=32):
@@ -65,6 +67,23 @@ def tv_output_byte_array(data, test_vector_name = "", line_prefix = "  ", max_le
         if len(string) == 0:
             print("\n",end="",file=file)
             return
+
+def tv_output_python_dictionary_as_json_base64(dictionary, line_prefix = "  ", max_len = 60, file = sys.stdout):
+    json_text = json.dumps(dictionary).encode("ASCII")
+    json_string = base64.standard_b64encode(json_text).decode("ASCII")
+
+    result = "\n"
+    base64_header = line_prefix + "###"
+    base64_trailer = "\n"
+
+    offset = 0;
+    while offset < len(json_string):
+    	next_chunk_len = min(len(json_string), max_len)
+    	result += base64_header + json_string[offset:(offset+next_chunk_len)] + base64_trailer
+    	offset += next_chunk_len
+    result += "\n"
+
+    print(result,end="",file=file)
 
 def prepend_len(data):
     "prepend LEB128 encoding of length"
@@ -257,17 +276,17 @@ With the above definition of lexiographical ordering ordered concatenation is sp
     print ("~~~", file = file)
 
 
-    print (""" 
+    print ("""
 
-### Definitions for transcript\_ir function
+### Definitions for transcript\\_ir function
 
 ~~~
 def transcript_ir(Ya,ADa,Yb,ADb):
     result = lv_cat(Ya,ADa) + lv_cat(Yb,ADb)
     return result
 ~~~""", file = file)
 
-    print ("\n### Test vectors transcript\_ir function\n", file = file)
+    print ("\n### Test vectors transcript\\_ir function\n", file = file)
 
     print ("~~~", file = file)
     tv_output_byte_array(transcript_ir(b"123",b"PartyA",b"234",b"PartyB"), 
@@ -280,17 +299,17 @@ def transcript_ir(Ya,ADa,Yb,ADb):
 
     print ("~~~", file = file)
 
-    print (""" 
+    print ("""
 
-### Definitions for transcript\_oc function
+### Definitions for transcript\\_oc function
 
 ~~~
 def transcript_oc(Ya,ADa,Yb,ADb):
     result = o_cat(lv_cat(Ya,ADa),lv_cat(Yb,ADb))
     return result
 ~~~""", file = file)
 
-    print ("\n### Test vectors for transcript\_oc function\n", file = file)
+    print ("\n### Test vectors for transcript\\_oc function\n", file = file)
 
     print ("~~~", file = file)
     tv_output_byte_array(transcript_oc(b"123",b"PartyA",b"234",b"PartyB"), 
@@ -303,6 +322,7 @@ def transcript_oc(Ya,ADa,Yb,ADb):
     print ("~~~", file = file)
 
 
+
 def zero_bytes(length):
     result = b"\0" * length
     return result
@@ -316,3 +336,5 @@ def random_bytes(length):
 
 if __name__ == "__main__":
 	generate_testvectors_string_functions()
+
+	tv_output_python_dictionary_as_json_base64(test_dictionary)

poc/CPace_testvectors.sage

@@ -153,22 +153,28 @@ def generate_test_vector(H,G, with_ANSI_C_initializers = True,file=sys.stdout, p
 
 
     dictionary = {}
-    dictionary["PRS"] = base64.b64encode(PRS).decode('ascii'); 
-    dictionary["CI"] = base64.b64encode(CI).decode('ascii'); 
-    dictionary["sid"] = base64.b64encode(sid).decode('ascii'); 
-    dictionary["g"] = base64.b64encode(g).decode('ascii'); 
-    dictionary["ya"] = base64.b64encode(ya).decode('ascii'); 
-    dictionary["ADa"] = base64.b64encode(ADa).decode('ascii'); 
-    dictionary["Ya"] = base64.b64encode(Ya).decode('ascii'); 
-    dictionary["yb"] = base64.b64encode(yb).decode('ascii');  
-    dictionary["ADb"] = base64.b64encode(ADb).decode('ascii');
-    dictionary["Yb"] = base64.b64encode(Yb).decode('ascii');
-    dictionary["K"] = base64.b64encode(K).decode('ascii');
-    dictionary["ISK_IR"] = base64.b64encode(ISK_IR).decode('ascii'); 
-    dictionary["ISK_SY"] = base64.b64encode(ISK_SY).decode('ascii');
-    dictionary["sid_output_ir"] = base64.b64encode(sid_output_ir).decode('ascii');
-    dictionary["sid_output_oc"] = base64.b64encode(sid_output_oc).decode('ascii');
-
+    dictionary["PRS"] = list(PRS)
+    dictionary["CI"] = list(CI)
+    dictionary["sid"] = list(sid)
+    dictionary["g"] = list(g)
+    dictionary["ya"] = list(ya)
+    dictionary["ADa"] = list(ADa)
+    dictionary["Ya"] = list(Ya)
+    dictionary["yb"] = list(yb)
+    dictionary["ADb"] = list(ADb)
+    dictionary["Yb"] = list(Yb)
+    dictionary["K"] = list(K)
+    dictionary["ISK_IR"] = list(ISK_IR)
+    dictionary["ISK_SY"] = list(ISK_SY)
+    dictionary["sid_output_ir"] = list(sid_output_ir)
+    dictionary["sid_output_oc"] = list(sid_output_oc)
+
+
+    print ("\n###  Testvectors as JSON file encoded as BASE64\n", file=file)
+    print ("~~~", file=file)
+    tv_output_python_dictionary_as_json_base64(dictionary,file=file)
+    print ("~~~\n", file=file)
+
     return dictionary    
 
 

poc/CPace_weierstrass.sage

@@ -1,4 +1,3 @@
-import base64
 import sys
 
 from sagelib.CPace_string_utils import *
@@ -147,10 +146,10 @@ def output_weierstrass_invalid_point_test_cases(G, file = sys.stdout):
                          line_prefix = "    ", max_len = 60, file = file)
     print ("~~~\n", file = file)
     dict_valid = {}
-    dict_valid["s"] = base64.b64encode(y).decode('ascii')
-    dict_valid["X"] = base64.b64encode(X).decode('ascii')
-    dict_valid["G.scalar_mult(s,X) (full coordinates)"] = base64.b64encode(Z).decode('ascii')
-    dict_valid["G.scalar_mult_vfy(s,X) (only X-coordinate)"] = base64.b64encode(K).decode('ascii')
+    dict_valid["s"] = list(y)
+    dict_valid["X"] = list(X)
+    dict_valid["G.scalar_mult(s,X) (full coordinates)"] = list(Z)
+    dict_valid["G.scalar_mult_vfy(s,X) (only X-coordinate)"] = list(K)
     result_dict["Valid"] = dict_valid
 
     Y_inv1 = bytearray(X)
@@ -172,8 +171,13 @@ def output_weierstrass_invalid_point_test_cases(G, file = sys.stdout):
     print ("    G.scalar_mult_vfy(s,Y_i1) = G.scalar_mult_vfy(s,Y_i2) = G.I", file = file)
     print ("~~~\n", file = file)   
 
-    result_dict["Invalid Y1"] = base64.b64encode(Y_inv1).decode('ascii') 
-    result_dict["Invalid Y2"] = base64.b64encode(Y_inv2).decode('ascii') 
+    result_dict["Invalid Y1"] = list(Y_inv1)
+    result_dict["Invalid Y2"] = list(Y_inv2)
+
+    print ("\n####  Testvectors as JSON file encoded as BASE64\n", file=file)
+    print ("~~~", file=file)
+    tv_output_python_dictionary_as_json_base64(result_dict,line_prefix = "    ",file=file)
+    print ("~~~\n", file=file)    
 
     return result_dict 
 

poc/test_vectors_X448_X25519.sage

@@ -74,6 +74,12 @@ def output_test_vectors_for_weak_points_255(file = sys.stdout):
         ctr += 1;
 
     print ("~~~\n", file = file)
+
+    print ("\n####  Testvectors as JSON file encoded as BASE64\n", file=file)
+    print ("~~~", file=file)
+    tv_output_python_dictionary_as_json_base64(result_dict,line_prefix = "    ",file=file)
+    print ("~~~\n", file=file)
+
     return result_dict