Code review, includes, cmake

Author: maxtropets

cmake/crypto.cmake

@@ -45,9 +45,6 @@ target_link_libraries(
          $<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/lib/${COSE_RS_LIB}>
 )
 add_dependencies(ccfcrypto cargo-build_cose_rs)
-target_include_directories(
-  ccfcrypto PUBLIC $<BUILD_INTERFACE:${CCF_DIR}/src/cose>
-)
 set_property(TARGET ccfcrypto PROPERTY POSITION_INDEPENDENT_CODE ON)
 
 install(

src/cose/cose_rs_ffi.h

@@ -12,7 +12,7 @@ extern "C"
 #endif
 
   /// Opaque handle to a Rust-managed signing key.
-  typedef struct CoseEvpKey CoseEvpKey;
+  struct CoseEvpKey;
 
   /// Create a signing key from DER-encoded private key bytes.
   /// Returns an opaque pointer, or NULL on failure.

src/cose/test/cose_ffi_test.cpp

@@ -2,7 +2,7 @@
 // Licensed under the Apache 2.0 License.
 #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
 
-#include "cose_rs_ffi.h"
+#include "cose/cose_rs_ffi.h"
 #include "crypto/cbor.h"
 #include "crypto/cose.h"
 #include "crypto/openssl/ec_key_pair.h"

src/crypto/openssl/cose_verifier.cpp

@@ -5,7 +5,7 @@
 
 #include "ccf/crypto/ec_public_key.h"
 #include "ccf/crypto/openssl/openssl_wrappers.h"
-#include "cose_rs_ffi.h"
+#include "cose/cose_rs_ffi.h"
 #include "crypto/openssl/rsa_key_pair.h"
 #include "ds/internal_logger.h"
 #include "x509_time.h"

src/node/history.h

@@ -6,7 +6,7 @@
 #include "ccf/pal/locking.h"
 #include "ccf/service/tables/nodes.h"
 #include "ccf/service/tables/service.h"
-#include "cose_rs_ffi.h"
+#include "cose/cose_rs_ffi.h"
 #include "crypto/cose.h"
 #include "crypto/openssl/ec_key_pair.h"
 #include "crypto/openssl/hash.h"

src/service/internal_tables_access.h

@@ -16,7 +16,7 @@
 #include "ccf/service/tables/virtual_measurements.h"
 #include "ccf/tx.h"
 #include "consensus/aft/raft_types.h"
-#include "cose_rs_ffi.h"
+#include "cose/cose_rs_ffi.h"
 #include "node/ledger_secrets.h"
 #include "node/uvm_endorsements.h"
 #include "service/tables/governance_history.h"