diff options
| author | stoffu <stoffu@protonmail.ch> | 2018-03-05 16:16:30 +0900 |
|---|---|---|
| committer | stoffu <stoffu@protonmail.ch> | 2018-03-14 21:00:15 +0900 |
| commit | 27a196b1268718dbc41e308c93b35c58f2da2eb4 (patch) | |
| tree | f3e28abc5ef6efc4fd25530fa9b86df6edde664b /src/ringct/rctSigs.h | |
| parent | device: made function prototypes consistent with pre-#3303 codebase (diff) | |
| download | monero-27a196b1268718dbc41e308c93b35c58f2da2eb4.tar.xz | |
device: untangle cyclic depenency
When #3303 was merged, a cyclic dependency chain was generated:
libdevice <- libcncrypto <- libringct <- libdevice
This was because libdevice needs access to a set of basic crypto operations
implemented in libringct such as scalarmultBase(), while libringct also needs
access to abstracted crypto operations implemented in libdevice such as
ecdhEncode(). To untangle this cyclic dependency chain, this patch splits libringct
into libringct_basic and libringct, where the basic crypto ops previously in
libringct are moved into libringct_basic. The cyclic dependency is now resolved
thanks to this separation:
libcncrypto <- libringct_basic <- libdevice <- libcryptonote_basic <- libringct
This eliminates the need for crypto_device.cpp and rctOps_device.cpp.
Also, many abstracted interfaces of hw::device such as encrypt_payment_id() and
get_subaddress_secret_key() were previously implemented in libcryptonote_basic
(cryptonote_format_utils.cpp) and were then called from hw::core::device_default,
which is odd because libdevice is supposed to be independent of libcryptonote_basic.
Therefore, those functions were moved to device_default.cpp.
Diffstat (limited to 'src/ringct/rctSigs.h')
| -rw-r--r-- | src/ringct/rctSigs.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/ringct/rctSigs.h b/src/ringct/rctSigs.h index 7485938ee..b8aab0f11 100644 --- a/src/ringct/rctSigs.h +++ b/src/ringct/rctSigs.h @@ -50,8 +50,6 @@ extern "C" { #include "rctTypes.h" #include "rctOps.h" -#include "cryptonote_basic/cryptonote_basic.h" -#include "device/device_declare.hpp" //Define this flag when debugging to get additional info on the console #ifdef DBG @@ -60,6 +58,9 @@ extern "C" { #define DP(x) #endif +namespace hw { + class device; +} namespace rct { |