Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-08-07 07:12:17 -04:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Use domain-separated ChaCha20 for in-memory key encryption"

Browse source 
This reverts commit 921dd8dde5.
This commit is contained in:
luigi1111 2020-08-17 14:08:59 -05:00
parent 43a4fd9e16
commit 765db1ae7a
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
6 changed files with 50 additions and 172 deletions
Download patch file Download diff file Expand all files Collapse all files

40
tests/unit_tests/serialization.cpp
View file

@ -616,46 +616,6 @@ TEST(Serialization, serializes_ringct_types)
ASSERT_EQ(bp0, bp1);
}
TEST(Serialization, key_encryption_transition)
{
const cryptonote::network_type nettype = cryptonote::TESTNET;
tools::wallet2 w(nettype);
const boost::filesystem::path wallet_file = unit_test::data_dir / "wallet_9svHk1";
const boost::filesystem::path key_file = unit_test::data_dir / "wallet_9svHk1.keys";
const boost::filesystem::path temp_wallet_file = unit_test::data_dir / "wallet_9svHk1_temp";
const boost::filesystem::path temp_key_file = unit_test::data_dir / "wallet_9svHk1_temp.keys";
string password = "test";
bool r = false;
// Copy the original files for this test
boost::filesystem::copy(wallet_file,temp_wallet_file);
boost::filesystem::copy(key_file,temp_key_file);
try
{
// Key transition
w.load(temp_wallet_file.string(), password); // legacy decryption method
ASSERT_TRUE(w.get_load_info().is_legacy_key_encryption);
const crypto::secret_key view_secret_key = w.get_account().get_keys().m_view_secret_key;
w.rewrite(temp_wallet_file.string(), password); // transition to new key format
w.load(temp_wallet_file.string(), password); // new decryption method
ASSERT_FALSE(w.get_load_info().is_legacy_key_encryption);
ASSERT_EQ(w.get_account().get_keys().m_view_secret_key,view_secret_key);
r = true;
}
catch (const exception& e)
{}
// Remove the temporary files
boost::filesystem::remove(temp_wallet_file);
boost::filesystem::remove(temp_key_file);
ASSERT_TRUE(r);
}
TEST(Serialization, portability_wallet)
{
const cryptonote::network_type nettype = cryptonote::TESTNET;