Minecon724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Argon2 submodule settings

Browse source
This commit is contained in:
SergiySW 2017-09-29 18:48:37 +03:00
commit 4bab3e67bf
3 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

24
CMakeLists.txt
View file

@ -77,15 +77,14 @@ add_library (ed25519
ed25519-donna/ed25519.h
ed25519-donna/ed25519.c)
include_directories("${CMAKE_SOURCE_DIR}/Argon2/Source/Argon2")
include_directories("${CMAKE_SOURCE_DIR}/Argon2/Source/Blake2")
include_directories("${CMAKE_SOURCE_DIR}/Argon2/Source/Core")
include_directories("${CMAKE_SOURCE_DIR}/phc-winner-argon2/include")
include_directories("${CMAKE_SOURCE_DIR}/phc-winner-argon2/src")
include_directories("${CMAKE_SOURCE_DIR}/blake2")
if (CMAKE_SYSTEM_PROCESSOR EQUAL "x86_64")
set (ARGON_CORE Argon2/Source/Core/argon2-opt-core.cpp)
if (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
set (ARGON_CORE phc-winner-argon2/src/opt.c)
else ()
set (ARGON_CORE Argon2/Source/Core/argon2-ref-core.cpp)
set (ARGON_CORE phc-winner-argon2/src/ref.c)
endif ()
add_subdirectory (gtest)
@ -105,11 +104,12 @@ set (USE_INTERMEDIATE_OBJECTS_TARGET OFF CACHE BOOL "")
add_subdirectory (cryptopp)
add_library (argon2
Argon2/Source/Argon2/argon2.cpp
Argon2/Source/Argon2/argon2.h
Argon2/Source/Common/brg-endian.h
Argon2/Source/Core/argon2-core.cpp
Argon2/Source/Core/argon2-core.h
phc-winner-argon2/src/argon2.c
phc-winner-argon2/include/argon2.h
phc-winner-argon2/src/core.c
phc-winner-argon2/src/blake2/blake2b.c
phc-winner-argon2/src/thread.c
phc-winner-argon2/src/encoding.c
${ARGON_CORE})
add_library (xxhash
@ -240,7 +240,7 @@ add_executable (rai_node
rai/rai_node/daemon.hpp
rai/rai_node/entry.cpp)
set_target_properties (argon2 PROPERTIES COMPILE_FLAGS "${PLATFORM_CXX_FLAGS} ${PLATFORM_COMPILE_FLAGS}")
set_target_properties (argon2 PROPERTIES COMPILE_FLAGS "${PLATFORM_C_FLAGS} ${PLATFORM_COMPILE_FLAGS}")
set_target_properties (blake2 PROPERTIES COMPILE_FLAGS "${PLATFORM_C_FLAGS} ${PLATFORM_COMPILE_FLAGS} -D__SSE2__")
set_target_properties (ed25519 PROPERTIES COMPILE_FLAGS "${PLATFORM_C_FLAGS} ${PLATFORM_COMPILE_FLAGS} -DED25519_CUSTOMHASH -DED25519_CUSTOMRNG")
set_target_properties (secure node rai_node PROPERTIES COMPILE_FLAGS "${PLATFORM_CXX_FLAGS} ${PLATFORM_COMPILE_FLAGS} -DQT_NO_KEYWORDS -DACTIVE_NETWORK=${ACTIVE_NETWORK} -DRAIBLOCKS_VERSION_MAJOR=${CPACK_PACKAGE_VERSION_MAJOR} -DRAIBLOCKS_VERSION_MINOR=${CPACK_PACKAGE_VERSION_MINOR} -DBOOST_ASIO_HAS_STD_ARRAY=1")

2
rai/node/wallet.cpp
View file

@ -850,7 +850,7 @@ void rai::wallet_store::upgrade_v2_v3 ()
void rai::kdf::phs (rai::raw_key & result_a, std::string const & password_a, rai::uint256_union const & salt_a)
{
std::lock_guard <std::mutex> lock (mutex);
auto success (PHS (result_a.data.bytes.data (), result_a.data.bytes.size (), password_a.data (), password_a.size (), salt_a.bytes.data (), salt_a.bytes.size (), 1, rai::wallet_store::kdf_work));
auto success (argon2_hash (1, rai::wallet_store::kdf_work, 1, password_a.data (), password_a.size (), salt_a.bytes.data (), salt_a.bytes.size (), result_a.data.bytes.data (), result_a.data.bytes.size (), NULL, 0, Argon2_d, 0x10));
assert (success == 0); (void) success;
}

2
rai/rai_node/entry.cpp
View file

@ -244,7 +244,7 @@ int main (int argc, char * const * argv)
for (; true;)
{
auto begin1 (std::chrono::high_resolution_clock::now ());
auto success (PHS (result.bytes.data (), result.bytes.size (), password.data (), password.size (), salt.bytes.data (), salt.bytes.size (), 1, rai::wallet_store::kdf_work));
auto success (argon2_hash (1, rai::wallet_store::kdf_work, 1, password.data (), password.size (), salt.bytes.data (), salt.bytes.size (), result.bytes.data (), result.bytes.size (), NULL, 0, Argon2_d, 0x10));
auto end1 (std::chrono::high_resolution_clock::now ());
std::cerr << boost::str (boost::format ("Derivation time: %1%us\n") % std::chrono::duration_cast <std::chrono::microseconds> (end1 - begin1).count ());
}