Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Nov 6, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bazel/repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion yacl/crypto/base/aes/aes_intrinsics.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion yacl/crypto/base/ecc/mcl/mcl_pairing_bls12_381.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion yacl/crypto/base/ecc/mcl/mcl_pairing_factory.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down
2 changes: 1 addition & 1 deletion yacl/crypto/base/ecc/mcl/mcl_pairing_group.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion yacl/crypto/base/ecc/mcl/mcl_pairing_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
Loading
Loading