hardcoresushi
/
libcryfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Use cryptopp scrypt instead of vendor/scrypt one

This commit is contained in:
Sebastian Messmer 2018-05-19 13:53:21 -07:00
parent 8265cd92b2
commit fede748ff4
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -1,4 +1,5 @@
cmake_minimum_required(VERSION 3.0 FATAL_ERROR) cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
cmake_policy(SET CMP0054 NEW)
# note: for clang-tidy, we need cmake 3.6, or (if the return code should be handled correctly, e.g. on CI), we need 3.8. # note: for clang-tidy, we need cmake 3.6, or (if the return code should be handled correctly, e.g. on CI), we need 3.8.

2
src/cpp-utils/CMakeLists.txt
View File

@ -63,7 +63,7 @@ target_link_libraries(${PROJECT_NAME} PUBLIC ${CMAKE_THREAD_LIBS_INIT})
target_link_libraries(${PROJECT_NAME} PUBLIC ${CMAKE_DL_LIBS}) target_link_libraries(${PROJECT_NAME} PUBLIC ${CMAKE_DL_LIBS})
target_link_libraries(${PROJECT_NAME} PUBLIC scrypt spdlog cryptopp) target_link_libraries(${PROJECT_NAME} PUBLIC spdlog cryptopp)
target_add_boost(${PROJECT_NAME} filesystem system thread) target_add_boost(${PROJECT_NAME} filesystem system thread)
target_enable_style_warnings(${PROJECT_NAME}) target_enable_style_warnings(${PROJECT_NAME})

16
src/cpp-utils/crypto/kdf/Scrypt.cpp
View File

@ -1,4 +1,5 @@
#include "Scrypt.h" #include "Scrypt.h"
#include <cryptopp/scrypt.h>
using std::string; using std::string;
@ -23,12 +24,15 @@ namespace cpputils {
void SCrypt::derive(void *destination, size_t size, const string &password) { void SCrypt::derive(void *destination, size_t size, const string &password) {
_checkCallOnlyOnce(); _checkCallOnlyOnce();
int errorcode = crypto_scrypt(reinterpret_cast<const uint8_t*>(password.c_str()), password.size(),
static_cast<const uint8_t*>(_config.salt().data()), _config.salt().size(), size_t status = CryptoPP::Scrypt().DeriveKey(
_config.N(), _config.r(), _config.p(), static_cast<uint8_t*>(destination), size,
static_cast<uint8_t*>(destination), size); reinterpret_cast<const uint8_t*>(password.c_str()), password.size(),
if (errorcode != 0) { static_cast<const uint8_t*>(_config.salt().data()), _config.salt().size(),
throw std::runtime_error("Error running scrypt key derivation. Error code: "+std::to_string(errorcode)); _config.N(), _config.r(), _config.p()
);
if (status != 1) {
throw std::runtime_error("Error running scrypt key derivation. Error code: "+std::to_string(status));
} }
} }

5
src/cpp-utils/crypto/kdf/Scrypt.h
View File

@ -7,9 +7,6 @@
#include "../../pointer/unique_ref.h" #include "../../pointer/unique_ref.h"
#include "PasswordBasedKDF.h" #include "PasswordBasedKDF.h"
extern "C" {
#include <scrypt/lib/crypto/crypto_scrypt.h>
}
#include <stdexcept> #include <stdexcept>
#include "SCryptParameters.h" #include "SCryptParameters.h"
@ -25,7 +22,7 @@ namespace cpputils {
class SCrypt final : public PasswordBasedKDF { class SCrypt final : public PasswordBasedKDF {
public: public:
static constexpr SCryptSettings ParanoidSettings = SCryptSettings {32, 1048576, 8, 16}; static constexpr SCryptSettings ParanoidSettings = SCryptSettings {32, 1048576, 8, 16};
static constexpr SCryptSettings DefaultSettings = SCryptSettings {32, 1048576, 4, 1}; static constexpr SCryptSettings DefaultSettings = SCryptSettings {32, 1048576, 4, 4};
static constexpr SCryptSettings TestSettings = SCryptSettings {32, 1024, 1, 1}; static constexpr SCryptSettings TestSettings = SCryptSettings {32, 1024, 1, 1};
static unique_ref<SCrypt> forNewKey(const SCryptSettings &settings); static unique_ref<SCrypt> forNewKey(const SCryptSettings &settings);