rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-23 18:47:36 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2784

Browse Source 
54a4c1cb cryptonote: do not overwrite const data (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-11-25 19:49:22 +02:00
commit 7dc58410e5
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cryptonote_basic/cryptonote_format_utils.cpp
View File

@ -994,7 +994,7 @@ namespace cryptonote
block_hashes_cached = block_hashes_cached_count; block_hashes_cached = block_hashes_cached_count;
} }
//--------------------------------------------------------------- //---------------------------------------------------------------
crypto::secret_key encrypt_key(const crypto::secret_key &key, const std::string &passphrase) crypto::secret_key encrypt_key(crypto::secret_key key, const std::string &passphrase)
{ {
crypto::hash hash; crypto::hash hash;
crypto::cn_slow_hash(passphrase.data(), passphrase.size(), hash); crypto::cn_slow_hash(passphrase.data(), passphrase.size(), hash);
@ -1002,7 +1002,7 @@ namespace cryptonote
return key; return key;
} }
//--------------------------------------------------------------- //---------------------------------------------------------------
crypto::secret_key decrypt_key(const crypto::secret_key &key, const std::string &passphrase) crypto::secret_key decrypt_key(crypto::secret_key key, const std::string &passphrase)
{ {
crypto::hash hash; crypto::hash hash;
crypto::cn_slow_hash(passphrase.data(), passphrase.size(), hash); crypto::cn_slow_hash(passphrase.data(), passphrase.size(), hash);

4
src/cryptonote_basic/cryptonote_format_utils.h
View File

@ -226,8 +226,8 @@ namespace cryptonote
bool is_valid_decomposed_amount(uint64_t amount); bool is_valid_decomposed_amount(uint64_t amount);
void get_hash_stats(uint64_t &tx_hashes_calculated, uint64_t &tx_hashes_cached, uint64_t &block_hashes_calculated, uint64_t & block_hashes_cached); void get_hash_stats(uint64_t &tx_hashes_calculated, uint64_t &tx_hashes_cached, uint64_t &block_hashes_calculated, uint64_t & block_hashes_cached);
crypto::secret_key encrypt_key(const crypto::secret_key &key, const std::string &passphrase); crypto::secret_key encrypt_key(crypto::secret_key key, const std::string &passphrase);
crypto::secret_key decrypt_key(const crypto::secret_key &key, const std::string &passphrase); crypto::secret_key decrypt_key(crypto::secret_key key, const std::string &passphrase);
#define CHECKED_GET_SPECIFIC_VARIANT(variant_var, specific_type, variable_name, fail_return_val) \ #define CHECKED_GET_SPECIFIC_VARIANT(variant_var, specific_type, variable_name, fail_return_val) \
CHECK_AND_ASSERT_MES(variant_var.type() == typeid(specific_type), fail_return_val, "wrong variant type: " << variant_var.type().name() << ", expected " << typeid(specific_type).name()); \ CHECK_AND_ASSERT_MES(variant_var.type() == typeid(specific_type), fail_return_val, "wrong variant type: " << variant_var.type().name() << ", expected " << typeid(specific_type).name()); \
specific_type& variable_name = boost::get<specific_type>(variant_var); specific_type& variable_name = boost::get<specific_type>(variant_var);