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

Fix loading encryption keys from config file

Browse Source
This commit is contained in:
Sebastian Messmer 2015-04-27 18:00:11 +02:00
parent 8f7853f01a
commit fa4e23ceb4
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CryDevice.cpp
View File

@ -56,6 +56,8 @@ CryDevice::Cipher::EncryptionKey CryDevice::GetOrCreateEncryptionKey(CryConfig *
config->SetEncryptionKey(new_key.ToString()); config->SetEncryptionKey(new_key.ToString());
return new_key; return new_key;
} }
return Cipher::EncryptionKey::FromString(encryption_key);
} }
Key CryDevice::CreateRootBlobAndReturnKey() { Key CryDevice::CreateRootBlobAndReturnKey() {

6
test/CryFsTest.cpp
View File

@ -5,6 +5,8 @@
#include <messmer/blockstore/implementations/ondisk/OnDiskBlockStore.h> #include <messmer/blockstore/implementations/ondisk/OnDiskBlockStore.h>
#include "../src/CryDevice.h" #include "../src/CryDevice.h"
#include "../src/CryDir.h" #include "../src/CryDir.h"
#include "../src/CryFile.h"
#include "../src/CryOpenFile.h"
//TODO (whole project) Make constructors explicit when implicit construction not needed //TODO (whole project) Make constructors explicit when implicit construction not needed
@ -28,8 +30,8 @@ public:
TEST_F(CryFsTest, CreatedRootdirIsLoadableAfterClosing) { TEST_F(CryFsTest, CreatedRootdirIsLoadableAfterClosing) {
{ {
CryDevice dev(make_unique<CryConfig>(config.path()), make_unique<OnDiskBlockStore>(rootdir.path())); CryDevice dev(make_unique<CryConfig>(config.path()), make_unique<OnDiskBlockStore>(rootdir.path()));
dev.Load(bf::path("/"));
} }
CryDevice dev(make_unique<CryConfig>(config.path()), make_unique<OnDiskBlockStore>(rootdir.path())); CryDevice dev(make_unique<CryConfig>(config.path()), make_unique<OnDiskBlockStore>(rootdir.path()));
dev.Load(bf::path("/")); auto root = dev.Load(bf::path("/"));
dynamic_pointer_move<CryDir>(root)->children();
} }