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/wallet/api | |
| 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/wallet/api')
| -rw-r--r-- | src/wallet/api/wallet_manager.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/wallet/api/wallet_manager.cpp b/src/wallet/api/wallet_manager.cpp index b03332f40..80f5780b5 100644 --- a/src/wallet/api/wallet_manager.cpp +++ b/src/wallet/api/wallet_manager.cpp @@ -37,7 +37,6 @@ #include "common/updates.h" #include "version.h" #include "net/http_client.h" -#include "device/device.hpp" #include <boost/filesystem.hpp> #include <boost/regex.hpp> |