Skip to content

Commit

Permalink
Remove most of crypto and move out of search path
Browse files Browse the repository at this point in the history
We only use keccak out of cncrypto, so this removes all the other junk,
and minimally modifies the keccak implementation to build in ethyl
without needing other files (and updates the keccak signature to match
oxen-core's, which changed the last argument from int to size_t).

This also puts it under a src/ethyl-keccak subdirectory so that when we
are building with cncrypto from oxen-core, we won't find the local
version in our include path and instead get the appropriate headers via
oxen-core when building with oxen-core's cncrypto.
  • Loading branch information
jagerman committed Jun 12, 2024
1 parent 1b3b5bc commit 431b1c0
Show file tree
Hide file tree
Showing 211 changed files with 55 additions and 64,047 deletions.
6 changes: 2 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,8 @@ endif()

# Find all headers and implementation files
include(cmake/SourcesAndHeaders.cmake)
if(${PROJECT_NAME}_ENABLE_CRYPTO_LIBRARY)
add_subdirectory(src/crypto)
endif()
add_subdirectory(external)
add_subdirectory(src/ethyl-keccak)

add_library(
${PROJECT_NAME}
Expand Down Expand Up @@ -99,8 +97,8 @@ target_link_libraries(
secp256k1
nlohmann_json::nlohmann_json
oxenc::oxenc
ethyl-keccak
PRIVATE
cncrypto
gmp
gmpxx
)
Expand Down
103 changes: 0 additions & 103 deletions src/crypto/CMakeLists.txt

This file was deleted.

205 changes: 0 additions & 205 deletions src/crypto/aesb.c

This file was deleted.

Loading

0 comments on commit 431b1c0

Please sign in to comment.