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

Fix test cases

Browse Source
This commit is contained in:
Sebastian Messmer 2017-09-30 09:30:31 +01:00
parent be9f7a4c3d
commit bd34a04d0c
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
test/cryfs/config/CryConfigLoaderTest.cpp
View File

@ -15,6 +15,7 @@ using cpputils::make_unique_ref;
using cpputils::TempFile; using cpputils::TempFile;
using cpputils::SCrypt; using cpputils::SCrypt;
using cpputils::DataFixture; using cpputils::DataFixture;
using cpputils::Data;
using cpputils::NoninteractiveConsole; using cpputils::NoninteractiveConsole;
using boost::optional; using boost::optional;
using boost::none; using boost::none;
@ -35,6 +36,20 @@ namespace boost {
} }
#include <boost/optional/optional_io.hpp> #include <boost/optional/optional_io.hpp>
class FakeRandomGenerator final : public cpputils::RandomGenerator {
public:
FakeRandomGenerator(Data output)
: _output(std::move(output)) {}
void _get(void *target, size_t bytes) override {
ASSERT_EQ(_output.size(), bytes);
std::memcpy(target, _output.data(), bytes);
}
private:
Data _output;
};
class CryConfigLoaderTest: public ::testing::Test, public TestWithMockConsole, TestWithFakeHomeDirectory { class CryConfigLoaderTest: public ::testing::Test, public TestWithMockConsole, TestWithFakeHomeDirectory {
public: public:
CryConfigLoaderTest(): file(false) { CryConfigLoaderTest(): file(false) {
@ -79,7 +94,11 @@ public:
} }
void CreateWithEncryptionKey(const string &encKey, const string &password = "mypassword") { void CreateWithEncryptionKey(const string &encKey, const string &password = "mypassword") {
auto cfg = loader(password, false).loadOrCreate(file.path()).value().configFile; auto askPassword = [password] { return password;};
FakeRandomGenerator generator(Data::FromString(encKey));
auto loader = CryConfigLoader(console, generator, SCrypt::TestSettings, askPassword,
askPassword, none, none, none);
auto cfg = loader.loadOrCreate(file.path()).value().configFile;
cfg.config()->SetEncryptionKey(encKey); cfg.config()->SetEncryptionKey(encKey);
cfg.save(); cfg.save();
} }
@ -177,9 +196,9 @@ TEST_F(CryConfigLoaderTest, RootBlob_Create) {
} }
TEST_F(CryConfigLoaderTest, EncryptionKey_Load) { TEST_F(CryConfigLoaderTest, EncryptionKey_Load) {
CreateWithEncryptionKey("encryptionkey"); CreateWithEncryptionKey("3B4682CF22F3CA199E385729B9F3CA19D325229E385729B9443CA19D325229E3");
auto loaded = Load().value(); auto loaded = Load().value();
EXPECT_EQ("encryptionkey", loaded.config()->EncryptionKey()); EXPECT_EQ("3B4682CF22F3CA199E385729B9F3CA19D325229E385729B9443CA19D325229E3", loaded.config()->EncryptionKey());
} }
TEST_F(CryConfigLoaderTest, EncryptionKey_Create) { TEST_F(CryConfigLoaderTest, EncryptionKey_Create) {