diff options
author | luigi1111 <luigi1111w@gmail.com> | 2022-09-15 16:25:22 -0500 |
---|---|---|
committer | luigi1111 <luigi1111w@gmail.com> | 2022-09-15 16:25:22 -0500 |
commit | 7cbae6ca988dedbe358ee5edbf9bdd610673a8ee (patch) | |
tree | 7087c8405264f60dc0bc0e4aa238df82f6554fac /src/multisig/multisig_account_kex_impl.cpp | |
parent | Merge pull request #8544 (diff) | |
parent | Merge pull request #5 from j-berman/restore-msig-encrypted-seed (diff) | |
download | monero-7cbae6ca988dedbe358ee5edbf9bdd610673a8ee.tar.xz |
Merge pull request #8545v0.18.1.1
12e7c41 Merge pull request #5 from j-berman/restore-msig-encrypted-seed (Justin Berman)
848a0c0 Fix segfault restoring encrypted multisig seed (j-berman)
401f5d9 Require user ack multisig is experimental to restore (j-berman)
fc8a5d6 multisig: fix #8537 seed restore (suggestions by @UkoeHB) (j-berman)
Diffstat (limited to 'src/multisig/multisig_account_kex_impl.cpp')
-rw-r--r-- | src/multisig/multisig_account_kex_impl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multisig/multisig_account_kex_impl.cpp b/src/multisig/multisig_account_kex_impl.cpp index be9ed9cb2..443e84631 100644 --- a/src/multisig/multisig_account_kex_impl.cpp +++ b/src/multisig/multisig_account_kex_impl.cpp @@ -74,7 +74,7 @@ namespace multisig "Multisig threshold may not be larger than number of signers."); CHECK_AND_ASSERT_THROW_MES(threshold > 0, "Multisig threshold must be > 0."); CHECK_AND_ASSERT_THROW_MES(round > 0, "Multisig kex round must be > 0."); - CHECK_AND_ASSERT_THROW_MES(round <= multisig_kex_rounds_required(num_signers, threshold) + 1, + CHECK_AND_ASSERT_THROW_MES(round <= multisig_setup_rounds_required(num_signers, threshold), "Trying to process multisig kex for an invalid round."); } //---------------------------------------------------------------------------------------------------------------------- |