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

Add Key::ToBinary, Key::FromBinary and more test cases for Key

Browse Source
This commit is contained in:
Sebastian Messmer 2014-12-13 11:59:48 +01:00
parent 83fad1ca53
commit 961fdd1d0b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cryfs_lib/CryDevice.cpp
View File

@ -29,7 +29,7 @@ Key CryDevice::GetOrCreateRootKey(CryConfig *config) {
string root_key = config->RootBlock(); string root_key = config->RootBlock();
if (root_key == "") { if (root_key == "") {
auto key = CreateRootBlockAndReturnKey(); auto key = CreateRootBlockAndReturnKey();
config->SetRootBlock(key.AsString()); config->SetRootBlock(key.ToString());
return key; return key;
} }

2
src/cryfs_lib/impl/DirBlock.cpp
View File

@ -63,7 +63,7 @@ const char *DirBlock::readAndAddNextChild(const char *pos, vector<string> *resul
} }
void DirBlock::AddChild(const std::string &name, const Key &blockKey) { void DirBlock::AddChild(const std::string &name, const Key &blockKey) {
string blockKeyStr = blockKey.AsString(); string blockKeyStr = blockKey.ToString();
char *insertPos = entriesEnd(); char *insertPos = entriesEnd();
assertEnoughSpaceLeft(insertPos, name.size() + 1 + blockKeyStr.size() + 1); assertEnoughSpaceLeft(insertPos, name.size() + 1 + blockKeyStr.size() + 1);