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

Fix merge error

Browse Source
This commit is contained in:
Sebastian Messmer 2016-06-25 14:46:37 -07:00
parent fd5dd2c6e1
commit d306f4872e
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/blockstore/implementations/versioncounting/VersionCountingBlock.h
View File

@ -115,6 +115,7 @@ inline bool VersionCountingBlock::_checkVersion(const cpputils::Data &data, cons
if(!knownBlockVersions->checkAndUpdateVersion(lastClientId, key, version)) { if(!knownBlockVersions->checkAndUpdateVersion(lastClientId, key, version)) {
cpputils::logging::LOG(cpputils::logging::WARN) << "Decrypting block " << key.ToString() << cpputils::logging::LOG(cpputils::logging::WARN) << "Decrypting block " << key.ToString() <<
" failed due to decreasing version number. Was the block rolled back or re-introduced by an attacker?"; " failed due to decreasing version number. Was the block rolled back or re-introduced by an attacker?";
return false;
} }
return true; return true;
} }