This is an automated email from the ASF dual-hosted git repository. kmccusker pushed a commit to branch issue64 in repository https://gitbox.apache.org/repos/asf/incubator-milagro-crypto-c.git
commit db155dcdbf0704618dcaa24dcae1584d7815b01b Author: Kealan McCusker <[email protected]> AuthorDate: Thu Jan 9 11:02:39 2020 +0000 fix bug in Python BLS wrapper --- python/bls_ZZZ.py.in | 91 +++------------------------------------------------- 1 file changed, 4 insertions(+), 87 deletions(-) diff --git a/python/bls_ZZZ.py.in b/python/bls_ZZZ.py.in index 20618fc..cf5e6d7 100755 --- a/python/bls_ZZZ.py.in +++ b/python/bls_ZZZ.py.in @@ -58,9 +58,6 @@ extern int BLS_ZZZ_SIGN(octet *SIG,char *m,octet *S); extern int BLS_ZZZ_VERIFY(octet *SIG,char *m,octet *W); extern int BLS_ZZZ_ADD_G1(octet *R1,octet *R2,octet *R); extern int BLS_ZZZ_ADD_G2(octet *W1,octet *W2,octet *W); -extern int BLS_ZZZ_MUL_G1(octet *P,octet *R,octet *T); -extern int BLS_ZZZ_MUL_G2(octet *P,octet *R,octet *T); - """) @@ -255,9 +252,10 @@ def sign(message, sk): Raises: """ + m, m_val = make_octet(None, message) sk1, sk1_val = make_octet(None, sk) signature1, signature1_val = make_octet(G1LEN) - error_code = libamcl_bls_ZZZ.BLS_ZZZ_SIGN(signature1, message, sk1) + error_code = libamcl_bls_ZZZ.BLS_ZZZ_SIGN(signature1, m, sk1) signature = to_str(signature1) @@ -286,9 +284,10 @@ def verify(signature, message, pk): Raises: """ + m, m_val = make_octet(None, message) pk1, pk1_val = make_octet(None, pk) signature1, signature1_val = make_octet(None, signature) - error_code = libamcl_bls_ZZZ.BLS_ZZZ_VERIFY(signature1, message, pk1) + error_code = libamcl_bls_ZZZ.BLS_ZZZ_VERIFY(signature1, m, pk1) # clear memory libamcl_core.OCT_clear(pk1) @@ -363,71 +362,6 @@ def add_G2(R1, R2): return error_code, R -def mult_G1(P, R): - """Multiple a member from the group G1 by an integer - - Multiple a member from the group G1 by an integer - - Args:: - - P: integer value - R: member of G1 - - Returns:: - - T: member of G1. T=P*R - error_code: Zero for success or else an error code - - Raises: - - """ - P1, P1_val = make_octet(None, P) - R1, R1_val = make_octet(None, R) - T1, T1_val = make_octet(G1LEN) - error_code = libamcl_bls_ZZZ.BLS_ZZZ_MUL_G1(P1, R1, T1) - - T = to_str(T1) - - # clear memory - libamcl_core.OCT_clear(P1) - libamcl_core.OCT_clear(R1) - libamcl_core.OCT_clear(T1) - - return error_code, T - - -def mult_G2(P, R): - """Multiple a member from the group G2 by an integer - - Multiple a member from the group G2 by an integer - - Args:: - - P: integer value - R: member of G1 - - Returns:: - - T: member of G1. T=P*R - error_code: Zero for success or else an error code - - Raises: - - """ - P1, P1_val = make_octet(None, P) - R1, R1_val = make_octet(None, R) - T1, T1_val = make_octet(G2LEN) - error_code = libamcl_bls_ZZZ.BLS_ZZZ_MUL_G2(P1, R1, T1) - - T = to_str(T1) - - # clear memory - libamcl_core.OCT_clear(P1) - libamcl_core.OCT_clear(R1) - libamcl_core.OCT_clear(T1) - - return error_code, T - if __name__ == "__main__": # Print hex values @@ -542,23 +476,6 @@ if __name__ == "__main__": raise SystemExit(0) print("Success: Aggregated signature is valid") - # Multiply signature and public key - rtn, sigmult = mult_G1(sk1, sig123) - if rtn != 0: - print("Error: mult_G1 {}".format(rtn)) - raise SystemExit(0) - - rtn, pkmult = mult_G2(sk1, pk123) - if rtn != 0: - print("Error: mult_G2 {}".format(rtn)) - raise SystemExit(0) - - rtn = verify(sigmult, message, pkmult) - if rtn != 0: - print("Error: Invalid multiplied signature {}".format(rtn)) - raise SystemExit(0) - print("Success: Multiplied signature is valid") - # Clear memory kill_csprng(rng) del sk1
