diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2020-08-28 11:52:54 +0000 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2020-08-28 11:52:54 +0000 |
| commit | e6c81c5ea7b06eaf19ce1e4c4294b09f4c6faf50 (patch) | |
| tree | 551ac0bbaaa3e09cbb1aa93954f71b247eac9d2f | |
| parent | Merge pull request #6769 (diff) | |
| download | monero-e6c81c5ea7b06eaf19ce1e4c4294b09f4c6faf50.tar.xz | |
ringct: fix CLSAG serialization after boost/epee changes
also fix a an assert message refering t MLSAG
| -rw-r--r-- | src/ringct/rctSigs.cpp | 2 | ||||
| -rw-r--r-- | src/ringct/rctTypes.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/ringct/rctSigs.cpp b/src/ringct/rctSigs.cpp index 2a7b36b66..5fd7ac06d 100644 --- a/src/ringct/rctSigs.cpp +++ b/src/ringct/rctSigs.cpp @@ -1599,7 +1599,7 @@ namespace rct { bool signMultisigCLSAG(rctSig &rv, const std::vector<unsigned int> &indices, const keyV &k, const multisig_out &msout, const key &secret_key) { CHECK_AND_ASSERT_MES(rv.type == RCTTypeCLSAG, false, "unsupported rct type"); CHECK_AND_ASSERT_MES(indices.size() == k.size(), false, "Mismatched k/indices sizes"); - CHECK_AND_ASSERT_MES(k.size() == rv.p.CLSAGs.size(), false, "Mismatched k/MGs size"); + CHECK_AND_ASSERT_MES(k.size() == rv.p.CLSAGs.size(), false, "Mismatched k/CLSAGs size"); CHECK_AND_ASSERT_MES(k.size() == msout.c.size(), false, "Mismatched k/msout.c size"); CHECK_AND_ASSERT_MES(rv.p.MGs.empty(), false, "MGs not empty for CLSAGs"); CHECK_AND_ASSERT_MES(msout.c.size() == msout.mu_p.size(), false, "Bad mu_p size"); diff --git a/src/ringct/rctTypes.h b/src/ringct/rctTypes.h index cb9e72d2b..e073bb61b 100644 --- a/src/ringct/rctTypes.h +++ b/src/ringct/rctTypes.h @@ -523,6 +523,7 @@ namespace rct { FIELD(rangeSigs) FIELD(bulletproofs) FIELD(MGs) + FIELD(CLSAGs) FIELD(pseudoOuts) END_SERIALIZE() }; |