repo-sync-2023-11-06T12:56:18+0800 (#159)

secretflow · Nov 6, 2023 · 6be4330 · 6be4330
1 parent f933d7f
commit 6be4330
Show file tree

Hide file tree

Showing 25 changed files with 262 additions and 234 deletions.
diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
@@ -20,7 +20,7 @@ SECRETFLOW_GIT = "https://github.com/secretflow"
 
 IC_COMMIT_ID = "dfa3281d641f33c85266b4e04e8c0214f9401cf7"
 
-SIMPLEST_OT_COMMIT_ID = "f40a33a37e3ff8cd81655c35237c177e358dc5b1"
+SIMPLEST_OT_COMMIT_ID = "4e39b7c35721c7fd968da6e047f59c0ac92e8088"
 
 def yacl_deps():
     _rule_python()

diff --git a/yacl/crypto/base/aes/aes_intrinsics.h b/yacl/crypto/base/aes/aes_intrinsics.h
@@ -84,7 +84,7 @@ inline uint128_t m128i_cast_uint128(__m128i x) {
 
 struct AES_KEY {
   __m128i rd_key[11];
-  unsigned int rounds;
+  unsigned int rounds = 0;
 };
 
 // set aes encryption key

diff --git a/yacl/crypto/base/ecc/mcl/mcl_pairing_bls12_381.h b/yacl/crypto/base/ecc/mcl/mcl_pairing_bls12_381.h
@@ -24,7 +24,7 @@ namespace yacl::crypto::hmcl {
 
 using MclPairingBls12381G1 = MclGroupT<mcl::bls12::Fp, mcl::bls12::Fr>;
 using MclPairingBls12381G2 = MclGroupT<mcl::bls12::Fp2, mcl::bls12::Fr>;
-using MclPairingBls12381GT = MclField<mcl::bls12::GT>;
+using MclPairingBls12381GT = MclField<mcl::bls12::GT, 12>;
 
 class MclPairingBls12381 : public PairingGroup {
  public:

diff --git a/yacl/crypto/base/ecc/mcl/mcl_pairing_factory.cc b/yacl/crypto/base/ecc/mcl/mcl_pairing_factory.cc
@@ -21,7 +21,7 @@ namespace yacl::crypto::hmcl {
 std::map<PairingName, int> Name2MclPairingEnum = {
     {"bls12-381", MCL_BLS12_381},
 #ifdef MCL_ALL_PAIRING_FOR_YACL
-    {"bn254n", MCL_BN254},        {"bn382m", MCL_BN381_1},
+    {"bn254", MCL_BN254},         {"bn382m", MCL_BN381_1},
     {"bn382r", MCL_BN381_2},      {"bn462", MCL_BN462},
     {"bn_snark1", MCL_BN_SNARK1}, {"bn160", MCL_BN160},
     {"bls12-377", MCL_BLS12_377}, {"bls12-461", MCL_BLS12_461},

diff --git a/yacl/crypto/base/ecc/mcl/mcl_pairing_group.h b/yacl/crypto/base/ecc/mcl/mcl_pairing_group.h
@@ -38,7 +38,7 @@ class MclPGFactory {
       MclGroupT<mcl::curve_name::Fp, mcl::curve_name::Fr>;  \
   using MclPairing##classname##G2 =                         \
       MclGroupT<mcl::curve_name::Fp2, mcl::curve_name::Fr>; \
-  using MclPairing##classname##GT = MclField<mcl::curve_name::GT>;
+  using MclPairing##classname##GT = MclField<mcl::curve_name::GT, 12>;
 
 PAIRING_CURVE_ALIAS(BN254, bn254);
 PAIRING_CURVE_ALIAS(BN384M, bn382m);

diff --git a/yacl/crypto/base/ecc/mcl/mcl_pairing_test.cc b/yacl/crypto/base/ecc/mcl/mcl_pairing_test.cc
@@ -117,7 +117,7 @@ class MclPairingTest : public ::testing::Test {
 MCL_PAIRING_TEST(Bls12381, "bls12-381")
 
 #ifdef MCL_ALL_PAIRING_FOR_YACL
-MCL_PAIRING_TEST(BN254, "bn254n");
+MCL_PAIRING_TEST(BN254, "bn254");
 MCL_PAIRING_TEST(BN384M, "bn382m");
 MCL_PAIRING_TEST(BN384R, "bn382r");
 MCL_PAIRING_TEST(BN462, "bn462");