Gustavo Frederico
|
1e02560e7e
|
Merging the branch that has CGGMP21 Oct changes onto the master branch. Resolving conflicts (listed below). In general, file versions of CGGMP21 Oct were chosen and security patches or small recent improvements from the master branch were copied over.
Merge branch 'master' into feature/cggmp21oct-tss-lib-tmp-merge
# Conflicts:
# .github/workflows/test.yml
# Makefile
# README.md
# crypto/ckd/child_key_derivation.go
# crypto/ecpoint.go
# crypto/mta/proofs.go
# crypto/mta/range_proof.go
# crypto/mta/share_protocol.go
# crypto/mta/share_protocol_test.go
# crypto/paillier/paillier.go
# crypto/vss/feldman_vss.go
# ecdsa/keygen/ecdsa-keygen.pb.go
# ecdsa/keygen/local_party.go
# ecdsa/keygen/local_party_test.go
# ecdsa/keygen/messages.go
# ecdsa/keygen/prepare.go
# ecdsa/keygen/round_1.go
# ecdsa/keygen/round_2.go
# ecdsa/keygen/round_3.go
# ecdsa/keygen/round_4.go
# ecdsa/keygen/save_data.go
# ecdsa/resharing/ecdsa-resharing.pb.go
# ecdsa/resharing/local_party_test.go
# ecdsa/resharing/messages.go
# ecdsa/resharing/round_1_old_step_1.go
# ecdsa/resharing/round_4_new_step_2.go
# ecdsa/signing/ecdsa-signing.pb.go
# ecdsa/signing/finalize.go
# ecdsa/signing/key_derivation_util.go
# ecdsa/signing/local_party.go
# ecdsa/signing/local_party_test.go
# ecdsa/signing/messages.go
# ecdsa/signing/prepare.go
# ecdsa/signing/round_1.go
# ecdsa/signing/round_2.go
# ecdsa/signing/round_3.go
# ecdsa/signing/round_4.go
# ecdsa/signing/round_5.go
# ecdsa/signing/round_6.go
# ecdsa/signing/round_7.go
# ecdsa/signing/rounds.go
# eddsa/keygen/eddsa-keygen.pb.go
# eddsa/keygen/local_party.go
# eddsa/keygen/local_party_test.go
# eddsa/keygen/messages.go
# eddsa/keygen/round_1.go
# eddsa/keygen/round_2.go
# eddsa/keygen/round_3.go
# eddsa/keygen/save_data.go
# eddsa/keygen/test_utils.go
# eddsa/resharing/eddsa-resharing.pb.go
# eddsa/resharing/local_party.go
# eddsa/resharing/local_party_test.go
# eddsa/resharing/messages.go
# eddsa/resharing/round_1_old_step_1.go
# eddsa/resharing/round_4_new_step_2.go
# eddsa/signing/eddsa-signing.pb.go
# eddsa/signing/finalize.go
# eddsa/signing/local_party.go
# eddsa/signing/local_party_test.go
# eddsa/signing/messages.go
# eddsa/signing/prepare.go
# eddsa/signing/round_1.go
# eddsa/signing/round_2.go
# eddsa/signing/round_3.go
# eddsa/signing/rounds.go
# eddsa/signing/utils.go
# go.mod
# go.sum
# protob/ecdsa-keygen.proto
# protob/ecdsa-resharing.proto
# protob/ecdsa-signing.proto
# protob/eddsa-keygen.proto
# protob/eddsa-resharing.proto
# protob/eddsa-signing.proto
# protob/message.proto
# protob/signature.proto
# test/_ecdsa_fixtures/keygen_data_0.json
# test/_ecdsa_fixtures/keygen_data_1.json
# test/_ecdsa_fixtures/keygen_data_2.json
# test/_ecdsa_fixtures/keygen_data_3.json
# test/_ecdsa_fixtures/keygen_data_4.json
# test/_eddsa_fixtures/keygen_data_0.json
# test/_eddsa_fixtures/keygen_data_1.json
# test/_eddsa_fixtures/keygen_data_2.json
# test/_eddsa_fixtures/keygen_data_3.json
# test/_eddsa_fixtures/keygen_data_4.json
# test/config.go
# tss/message.pb.go
# tss/params.go
# tss/party.go
# tss/wire.go
|
2021-12-17 16:03:49 -05:00 |
|