Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove cryptopp dependency #113

Merged
merged 7 commits into from
Dec 13, 2020
Merged

Remove cryptopp dependency #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
afe27a3
RIPEMD-160 reference implementation
yperbasis Dec 10, 2020
4bd8d70
Use ref implementation of RIPEMD160 instead of crypto++
yperbasis Dec 10, 2020
7d3e954
SHA-256 from https://github.com/amosnier/sha-2
yperbasis Dec 11, 2020
ee95216
Remove cryptopp dependency
yperbasis Dec 11, 2020
ffce692
calculate_rmd160_digest -> calculate_ripemd_160
yperbasis Dec 11, 2020
f03eecf
Move macros to rmd160.c from the header
yperbasis Dec 11, 2020
36e5f81
Mention Silkworm modification in rmd160 version
yperbasis Dec 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions cmake/Hunter/config.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,3 @@ hunter_config(
URL https://github.com/chfast/ethash/archive/v0.5.2.tar.gz
SHA1 8d2859a9d09721ed7007007bd59a77c0bd9b2bee
)

hunter_config(
cryptopp
VERSION 8.2.0-p1
URL "https://github.com/torquem-ch/cryptopp/archive/v8.2.0-p1.tar.gz"
SHA1 d66a1e35fec987aa6a65d8ba6c849cd54cc3d5c2
)
1 change: 0 additions & 1 deletion cmake/Hunter/packages.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ hunter_add_package(benchmark)
hunter_add_package(Boost COMPONENTS filesystem)
hunter_add_package(Catch)
hunter_add_package(CLI11)
hunter_add_package(cryptopp)
hunter_add_package(ethash)
hunter_add_package(intx)
hunter_add_package(Microsoft.GSL)
Expand Down
3 changes: 1 addition & 2 deletions core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

find_package(absl CONFIG REQUIRED)
find_package(Boost CONFIG REQUIRED)
find_package(cryptopp CONFIG REQUIRED)
find_package(Microsoft.GSL CONFIG REQUIRED)

file(GLOB_RECURSE SILKWORM_CORE_SRC CONFIGURE_DEPENDS "*.cpp" "*.hpp" "*.c" "*.h")
Expand All @@ -28,6 +27,6 @@ target_include_directories(silkworm_core PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${SI

set(SILKWORM_CORE_PUBLIC_LIBS absl::flat_hash_map absl::flat_hash_set
evmc intx::intx ff Microsoft.GSL::GSL)
set(SILKWORM_CORE_PRIVATE_LIBS evmone secp256k1 cryptopp-static ethash::keccak Boost::boost)
set(SILKWORM_CORE_PRIVATE_LIBS evmone secp256k1 ethash::keccak Boost::boost)

target_link_libraries(silkworm_core PUBLIC ${SILKWORM_CORE_PUBLIC_LIBS} PRIVATE ${SILKWORM_CORE_PRIVATE_LIBS})
7 changes: 4 additions & 3 deletions core/silkworm/crypto/blake2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@
More information about the BLAKE2 hash function can be found at
https://blake2.net.
*/
#ifndef BLAKE2_H
#define BLAKE2_H

#ifndef SILKWORM_CRYPTO_BLAKE2_H_
#define SILKWORM_CRYPTO_BLAKE2_H_

#include <stddef.h>
#include <stdint.h>
Expand All @@ -37,4 +38,4 @@ void blake2b_compress(blake2b_state *S, const uint8_t block[BLAKE2B_BLOCKBYTES],
}
#endif

#endif
#endif // SILKWORM_CRYPTO_BLAKE2_H_
Loading