rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-29 18:53:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

change the N-1/N multisig second message signer for auth

Browse source
This commit is contained in:
moneromooo-monero 2017-11-29 16:55:50 +00:00
parent 55c2845d1a
commit ceabc4f92b
No known key found for this signature in database
GPG key ID: 686F07454D6CEFC3
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/wallet/wallet2.cpp
View file

@ -2832,7 +2832,8 @@ std::string wallet2::make_multisig(const epee::wipeable_string &password,
// We need an extra step, so we package all the composite public keys // We need an extra step, so we package all the composite public keys
// we know about, and make a signed string out of them // we know about, and make a signed string out of them
std::string data; std::string data;
const crypto::public_key signer = get_multisig_signer_public_key(rct::rct2sk(spend_skey)); crypto::public_key signer;
CHECK_AND_ASSERT_THROW_MES(crypto::secret_key_to_public_key(rct::rct2sk(spend_skey), signer), "Failed to derive public spend key");
data += std::string((const char *)&signer, sizeof(crypto::public_key)); data += std::string((const char *)&signer, sizeof(crypto::public_key));
for (const auto &msk: multisig_keys) for (const auto &msk: multisig_keys)
@ -2844,7 +2845,7 @@ std::string wallet2::make_multisig(const epee::wipeable_string &password,
data.resize(data.size() + sizeof(crypto::signature)); data.resize(data.size() + sizeof(crypto::signature));
crypto::cn_fast_hash(data.data(), data.size() - sizeof(signature), hash); crypto::cn_fast_hash(data.data(), data.size() - sizeof(signature), hash);
crypto::signature &signature = *(crypto::signature*)&data[data.size() - sizeof(crypto::signature)]; crypto::signature &signature = *(crypto::signature*)&data[data.size() - sizeof(crypto::signature)];
crypto::generate_signature(hash, signer, get_multisig_blinded_secret_key(rct::rct2sk(spend_skey)), signature); crypto::generate_signature(hash, signer, rct::rct2sk(spend_skey), signature);
extra_multisig_info = std::string("MultisigxV1") + tools::base58::encode(data); extra_multisig_info = std::string("MultisigxV1") + tools::base58::encode(data);
} }
@ -2954,7 +2955,9 @@ bool wallet2::finalize_multisig(const epee::wipeable_string &password, std::unor
CHECK_AND_ASSERT_THROW_MES(!pkeys.empty(), "empty pkeys"); CHECK_AND_ASSERT_THROW_MES(!pkeys.empty(), "empty pkeys");
// add ours if not included // add ours if not included
const crypto::public_key local_signer = get_multisig_signer_public_key(); crypto::public_key local_signer;
CHECK_AND_ASSERT_THROW_MES(crypto::secret_key_to_public_key(get_account().get_keys().m_spend_secret_key, local_signer),
"Failed to derive public spend key");
if (std::find(signers.begin(), signers.end(), local_signer) == signers.end()) if (std::find(signers.begin(), signers.end(), local_signer) == signers.end())
{ {
signers.push_back(local_signer); signers.push_back(local_signer);
@ -8381,13 +8384,9 @@ crypto::public_key wallet2::get_multisig_signer_public_key(const crypto::secret_
crypto::public_key wallet2::get_multisig_signer_public_key() const crypto::public_key wallet2::get_multisig_signer_public_key() const
{ {
CHECK_AND_ASSERT_THROW_MES(m_multisig, "Wallet is not multisig"); CHECK_AND_ASSERT_THROW_MES(m_multisig, "Wallet is not multisig");
if (m_multisig_threshold == m_multisig_signers.size())
{
crypto::public_key signer; crypto::public_key signer;
CHECK_AND_ASSERT_THROW_MES(crypto::secret_key_to_public_key(get_account().get_keys().m_spend_secret_key, signer), "Failed to generate signer public key"); CHECK_AND_ASSERT_THROW_MES(crypto::secret_key_to_public_key(get_account().get_keys().m_spend_secret_key, signer), "Failed to generate signer public key");
return signer; return signer;
}
return get_multisig_signer_public_key(get_account().get_keys().m_spend_secret_key);
} }
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------
crypto::public_key wallet2::get_multisig_signing_public_key(const crypto::secret_key &msk) const crypto::public_key wallet2::get_multisig_signing_public_key(const crypto::secret_key &msk) const