diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-03-14 16:04:10 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-03-14 16:04:10 +0200 |
| commit | 102a51bcd48a3cd2cb794aab7dbe243393f155b3 (patch) | |
| tree | 513aa5706a9ee849adab2f7cbe719de6741a8b43 /src/simplewallet/simplewallet.cpp | |
| parent | Merge pull request #3378 (diff) | |
| parent | wallet2: check_tx_key() shouldn't require hardware encryption (diff) | |
| download | monero-102a51bcd48a3cd2cb794aab7dbe243393f155b3.tar.xz | |
Merge pull request #3350
4405e4fc wallet2: check_tx_key() shouldn't require hardware encryption (stoffu)
7dfa5e9e chacha: call prehashed version explicitly as generate_chacha_key_prehashed hash: add prehashed version cn_slow_hash_prehashed slow-hash: let cn_slow_hash take 4th parameter for deciding prehashed or not slow-hash: add support for prehashed version for the other 3 platforms (stoffu)
b2d23b18 crypto: revert odd namespace changes made in #3303 (stoffu)
8705beaf keypair::generate: always require hw::device to avoid possible mistake (stoffu)
27a196b1 device: untangle cyclic depenency (stoffu)
c9b38b47 device: made function prototypes consistent with pre-#3303 codebase (stoffu)
Diffstat (limited to 'src/simplewallet/simplewallet.cpp')
| -rw-r--r-- | src/simplewallet/simplewallet.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index 71ce1574f..b6d94ef48 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -62,7 +62,6 @@ #include "ringct/rctSigs.h" #include "multisig/multisig.h" #include "wallet/wallet_args.h" -#include "device/device.hpp" #include <stdexcept> #ifdef WIN32 |