diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2015-10-25 16:16:59 +0000 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2015-10-25 16:34:57 +0000 |
| commit | ecbb732faab2b79225155dbd7f91b53ac34be669 (patch) | |
| tree | 1f1e3d1fec391d2ff9fd9170e3a1f9b3516805b1 /src/wallet | |
| parent | Merge pull request #437 (diff) | |
| download | monero-ecbb732faab2b79225155dbd7f91b53ac34be669.tar.xz | |
Fix leak on real output when using a very recent output
The wallet and the daemon applied different height considerations
when selecting outputs to use. This can leak information on which
input in a ring signature is the real one.
Found and originally fixed by smooth on Aeon.
Diffstat (limited to '')
| -rw-r--r-- | src/wallet/wallet2.cpp | 2 | ||||
| -rw-r--r-- | src/wallet/wallet2.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index cca409d9a..92777d16b 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -1073,7 +1073,7 @@ bool wallet2::is_transfer_unlocked(const transfer_details& td) const if(!is_tx_spendtime_unlocked(td.m_tx.unlock_time)) return false; - if(td.m_block_height + DEFAULT_TX_SPENDABLE_AGE > m_blockchain.size()) + if(td.m_block_height + CRYPTONOTE_DEFAULT_TX_SPENDABLE_AGE > m_blockchain.size()) return false; return true; diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index 0bffa7f12..a8c7f9b78 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -50,7 +50,6 @@ #include "wallet_errors.h" #include <iostream> -#define DEFAULT_TX_SPENDABLE_AGE 10 #define WALLET_RCP_CONNECTION_TIMEOUT 200000 namespace tools |