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

Change config file header to contain version information

Browse Source
This commit is contained in:
Sebastian Messmer 2015-10-26 12:35:22 +01:00
parent e090d1b6e1
commit a840bbba47
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/config/CryConfigEncryptor.h
View File

@ -39,7 +39,7 @@ namespace cryfs {
static const std::string HEADER; static const std::string HEADER;
}; };
template<class Cipher> const std::string CryConfigEncryptor<Cipher>::HEADER = "scrypt"; template<class Cipher> const std::string CryConfigEncryptor<Cipher>::HEADER = "cryfs.config;0.8.1;scrypt";
template<class Cipher> template<class Cipher>
typename CryConfigEncryptor<Cipher>::ConfigEncryptionKey CryConfigEncryptor<Cipher>::deriveKey(const std::string &password) { typename CryConfigEncryptor<Cipher>::ConfigEncryptionKey CryConfigEncryptor<Cipher>::deriveKey(const std::string &password) {
@ -146,7 +146,7 @@ namespace cryfs {
boost::optional<cpputils::Data> CryConfigEncryptor<Cipher>::_removePadding(const cpputils::Data &data) { boost::optional<cpputils::Data> CryConfigEncryptor<Cipher>::_removePadding(const cpputils::Data &data) {
uint32_t size; uint32_t size;
std::memcpy(&size, reinterpret_cast<const char*>(data.data()), sizeof(size)); std::memcpy(&size, reinterpret_cast<const char*>(data.data()), sizeof(size));
if(sizeof(size) + size >= CONFIG_SIZE) { if(sizeof(size) + size >= data.size()) {
cpputils::logging::LOG(cpputils::logging::ERROR) << "Config file is invalid: Invalid padding."; cpputils::logging::LOG(cpputils::logging::ERROR) << "Config file is invalid: Invalid padding.";
return boost::none; return boost::none;
}; };