Merge pull request #608 from eosnetworkfoundation/GH-554-GH-602-for-3.1

[3.1] Allow zero in alt_bn128; fix gmp linking in EosioTester
eosnetworkfoundation · Jul 6, 2022 · f56a10f · f56a10f
2 parents 5f193c2 + a0e740b
commit f56a10f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/CMakeModules/EosioTester.cmake.in b/CMakeModules/EosioTester.cmake.in
@@ -104,7 +104,7 @@ macro(add_eosio_test_executable test_name)
        ${libbuiltins}
        ${libsecp256k1}
        ${libff}
-       @GMP_LIBRARIES@
+       @GMP_LIBRARY@
 
        ${Boost_FILESYSTEM_LIBRARY}
        ${Boost_SYSTEM_LIBRARY}

diff --git a/CMakeModules/EosioTesterBuild.cmake.in b/CMakeModules/EosioTesterBuild.cmake.in
@@ -102,7 +102,7 @@ macro(add_eosio_test_executable test_name)
        ${libbuiltins}
        ${libsecp256k1}
        ${libff}
-       @GMP_LIBRARIES@
+       @GMP_LIBRARY@
 
        ${Boost_FILESYSTEM_LIBRARY}
        ${Boost_SYSTEM_LIBRARY}

diff --git a/libraries/fc b/libraries/fc
diff --git a/unittests/crypto_primitives_tests.cpp b/unittests/crypto_primitives_tests.cpp
@@ -86,8 +86,8 @@ BOOST_AUTO_TEST_CASE( alt_bn128_add_test ) { try {
         {
             "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "1bd20beca3d8d28e536d2b5bd3bf36d76af68af5e6c96ca6e5519ba9ff8f53322a53edf6b48bcf5cb1c0b4ad1d36dfce06a79dcd6526f1c386a14d8ce4649844",
-            return_code::failure,
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+            return_code::success,
+            "1bd20beca3d8d28e536d2b5bd3bf36d76af68af5e6c96ca6e5519ba9ff8f53322a53edf6b48bcf5cb1c0b4ad1d36dfce06a79dcd6526f1c386a14d8ce4649844"
         },
    };
 
@@ -172,7 +172,7 @@ BOOST_AUTO_TEST_CASE( alt_bn128_mul_test ) { try {
         {
             "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "0312ed43559cf8ecbab5221256a56e567aac5035308e3f1d54954d8b97cd1c9b",
-            return_code::failure,
+            return_code::success,
             "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
         },
    };
@@ -238,7 +238,7 @@ BOOST_AUTO_TEST_CASE( alt_bn128_pair_test ) { try {
                   "12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",
                }
          },
-         0
+         0 // With these input pairs, alt_bn128_pair should return 0 indicating a pair result of true.
       },
 
       //test2: 1 pair => (G1_a,G2_a) G1_a not on curve
@@ -286,10 +286,10 @@ BOOST_AUTO_TEST_CASE( alt_bn128_pair_test ) { try {
                },
 
          },
-         return_code::failure
+         0 // With these input pairs, alt_bn128_pair should return 0 indicating a pair result of true.
       },
 
-      //test6: 1 pair => (G1_a,G2_a) ; G1_a.x == |Fp|
+      //test5: 1 pair => (G1_a,G2_a) ; G1_a.x == |Fp|
       {
          {
                { //G1_a G2_a
+0 −1		include/fc/crypto/alt_bn128.hpp
+5 −2		src/crypto/alt_bn128.cpp
+2 −18		test/crypto/test_alt_bn128.cpp