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.

3 files changed, 0 insertions, 89 deletions

diff --git a/src/crypto/CMakeLists.txt b/src/crypto/CMakeLists.txt
index 35c099697..71dcedcab 100644
--- a/src/crypto/CMakeLists.txt
+++ b/src/crypto/CMakeLists.txt
@@ -33,7 +33,6 @@ set(crypto_sources
   crypto-ops-data.c
   crypto-ops.c
   crypto.cpp
-  crypto_device.cpp
   groestl.c
   hash-extra-blake.c
   hash-extra-groestl.c
@@ -78,7 +77,6 @@ monero_add_library(cncrypto
 target_link_libraries(cncrypto
   PUBLIC
     epee
-    device
     ${Boost_SYSTEM_LIBRARY}
   PRIVATE
     ${EXTRA_LIBRARIES})
diff --git a/src/crypto/crypto.h b/src/crypto/crypto.h
index 75b333473..9d0e5066b 100644
--- a/src/crypto/crypto.h
+++ b/src/crypto/crypto.h
@@ -46,7 +46,6 @@
 #include "hex.h"
 #include "span.h"
 #include "hash.h"
-#include "device/device_declare.hpp"
 extern "C" {
   #include "crypto-ops.h"
 }
@@ -156,17 +155,6 @@ namespace crypto {
       const public_key *const *, std::size_t, const signature *);
   };
 
-  secret_key generate_keys(public_key &pub, secret_key &sec, const secret_key& recovery_key, bool recover, hw::device &hwdev);
-  secret_key generate_keys(public_key &pub, secret_key &sec, hw::device &hwdev);
-  bool secret_key_to_public_key(const secret_key &sec, public_key &pub, hw::device &hwdev);
-  bool generate_key_derivation(const public_key &key1, const secret_key &key2, key_derivation &derivation, hw::device &hwdev);
-  void derivation_to_scalar(const key_derivation &derivation, size_t output_index, ec_scalar &res, hw::device &hwdev) ;
-  bool derive_public_key(const key_derivation &derivation, size_t output_index, const public_key &base, public_key &derived_key, hw::device &hwdev);
-  void derive_secret_key(const key_derivation &derivation, size_t output_index, const secret_key &base, secret_key &derived_key, hw::device &hwdev);
-  bool derive_subaddress_public_key(const public_key &out_key, const key_derivation &derivation, std::size_t output_index, public_key &derived_key, hw::device &hwdev);
-  void generate_key_image(const public_key &pub, const secret_key &sec, key_image &image, hw::device &hwdev);
-
-
   /* Generate N random bytes
    */
   inline void rand(size_t N, uint8_t *bytes) {
diff --git a/src/crypto/crypto_device.cpp b/src/crypto/crypto_device.cpp
deleted file mode 100644
index 30831dced..000000000
--- a/src/crypto/crypto_device.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright (c) 2014-2018, The Monero Project
-// 
-// All rights reserved.
-// 
-// Redistribution and use in source and binary forms, with or without modification, are
-// permitted provided that the following conditions are met:
-// 
-// 1. Redistributions of source code must retain the above copyright notice, this list of
-//    conditions and the following disclaimer.
-// 
-// 2. Redistributions in binary form must reproduce the above copyright notice, this list
-//    of conditions and the following disclaimer in the documentation and/or other
-//    materials provided with the distribution.
-// 
-// 3. Neither the name of the copyright holder nor the names of its contributors may be
-//    used to endorse or promote products derived from this software without specific
-//    prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// 
-
-
-#include "crypto.h"
-#include "device/device.hpp"
-#include "device/log.hpp"
-
-namespace crypto {
-
-    secret_key generate_keys(public_key &pub, secret_key &sec, const secret_key& recovery_key, bool recover, hw::device &hwdev) {
-        return hwdev.generate_keys(pub, sec, recovery_key, recover);
-    }
-
-    secret_key generate_keys(public_key &pub, secret_key &sec, hw::device &hwdev) {
-        return hwdev.generate_keys(pub, sec,  secret_key(), false);
-    }
-
-
-    bool secret_key_to_public_key(const secret_key &sec, public_key &pub, hw::device &hwdev) {
-       return hwdev.secret_key_to_public_key(sec, pub);
-    }
-
-    bool generate_key_derivation(const public_key &key1, const secret_key &key2, key_derivation &derivation, hw::device &hwdev) {
-        return hwdev.generate_key_derivation(key1, key2, derivation);
-    }
-
-    void derivation_to_scalar(const key_derivation &derivation, size_t output_index, ec_scalar &res, hw::device &hwdev) {
-        hwdev.derivation_to_scalar(derivation, output_index, res);
-    }
-
-    bool derive_public_key(const key_derivation &derivation, size_t output_index,
-                           const public_key &base, public_key &derived_key, hw::device &hwdev) {
-        return hwdev.derive_public_key(derivation, output_index, base, derived_key);
-    }
-
-    void derive_secret_key(const key_derivation &derivation, size_t output_index,
-                           const secret_key &base, secret_key &derived_key, hw::device &hwdev) {
-        hwdev.derive_secret_key(derivation, output_index, base, derived_key);
-    }
-
-    bool derive_subaddress_public_key(const public_key &out_key, const key_derivation &derivation, std::size_t output_index, public_key &derived_key, hw::device &hwdev) {
-        return hwdev.derive_subaddress_public_key(out_key, derivation, output_index, derived_key);
-    }
-
-    void generate_key_image(const public_key &pub, const secret_key &sec, key_image &image, hw::device &hwdev) {
-        hwdev.generate_key_image(pub,sec,image);
-    }
-}
\ No newline at end of file