diff options
| author | Lee Clagett <code@leeclagett.com> | 2019-11-15 14:08:28 +0000 |
|---|---|---|
| committer | Lee Clagett <code@leeclagett.com> | 2020-05-16 10:25:17 +0000 |
| commit | a11ec4ac1d335677842b447208a9b45d531beeb0 (patch) | |
| tree | 6f6c4129c5990019126eed5fd52e5f3f6e979944 /src/device | |
| parent | Merge pull request #6586 (diff) | |
| download | monero-a11ec4ac1d335677842b447208a9b45d531beeb0.tar.xz | |
Support for supercop ASM in wallet, and benchmark for supercop
Diffstat (limited to 'src/device')
| -rw-r--r-- | src/device/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/device/device_default.cpp | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/device/CMakeLists.txt b/src/device/CMakeLists.txt index 42dba2ebb..ff2afba4b 100644 --- a/src/device/CMakeLists.txt +++ b/src/device/CMakeLists.txt @@ -72,6 +72,7 @@ target_link_libraries(device ${HIDAPI_LIBRARIES} cncrypto ringct_basic + wallet-crypto ${OPENSSL_CRYPTO_LIBRARIES} ${Boost_SERIALIZATION_LIBRARY} PRIVATE diff --git a/src/device/device_default.cpp b/src/device/device_default.cpp index 7e054af35..096cb35ba 100644 --- a/src/device/device_default.cpp +++ b/src/device/device_default.cpp @@ -32,6 +32,7 @@ #include "device_default.hpp" #include "int-util.h" +#include "crypto/wallet/crypto.h" #include "cryptonote_basic/account.h" #include "cryptonote_basic/subaddress_index.h" #include "cryptonote_core/cryptonote_tx_utils.h" @@ -120,7 +121,7 @@ namespace hw { /* ======================================================================= */ bool device_default::derive_subaddress_public_key(const crypto::public_key &out_key, const crypto::key_derivation &derivation, const std::size_t output_index, crypto::public_key &derived_key) { - return crypto::derive_subaddress_public_key(out_key, derivation, output_index,derived_key); + return crypto::wallet::derive_subaddress_public_key(out_key, derivation, output_index,derived_key); } crypto::public_key device_default::get_subaddress_spend_public_key(const cryptonote::account_keys& keys, const cryptonote::subaddress_index &index) { @@ -236,7 +237,7 @@ namespace hw { } bool device_default::generate_key_derivation(const crypto::public_key &key1, const crypto::secret_key &key2, crypto::key_derivation &derivation) { - return crypto::generate_key_derivation(key1, key2, derivation); + return crypto::wallet::generate_key_derivation(key1, key2, derivation); } bool device_default::derivation_to_scalar(const crypto::key_derivation &derivation, const size_t output_index, crypto::ec_scalar &res){ |