Add more encryption ciphers

src/CryCipher.cpp

@@ -0,0 +1,80 @@
+#include "CryCipher.h"
+
+#include <messmer/blockstore/implementations/encrypted/ciphers/ciphers.h>
+#include <messmer/blockstore/implementations/encrypted/EncryptedBlockStore.h>
+
+using std::vector;
+using std::string;
+using cpputils::unique_ref;
+using cpputils::make_unique_ref;
+using blockstore::BlockStore;
+using std::shared_ptr;
+using std::make_shared;
+
+using namespace cryfs;
+using namespace blockstore::encrypted;
+
+template<typename Cipher>
+class CryCipherInstance: public CryCipher {
+public:
+    BOOST_CONCEPT_ASSERT((CipherConcept<Cipher>));
+
+    CryCipherInstance(const std::string &cipherName): _cipherName(cipherName) {
+    }
+
+    string cipherName() const override {
+        return _cipherName;
+    }
+
+    unique_ref<BlockStore> createEncryptedBlockstore(unique_ref<BlockStore> baseBlockStore, const string &encKey) const override {
+        return make_unique_ref<EncryptedBlockStore<Cipher>>(std::move(baseBlockStore), Cipher::EncryptionKey::FromString(encKey));
+    }
+
+    string createKey() const override {
+        return Cipher::EncryptionKey::CreateOSRandom().ToString();
+    }
+
+private:
+    string _cipherName;
+};
+
+//We have to use shared_ptr instead of unique_ref, because c++ initializer_list needs copyable values
+const vector<shared_ptr<CryCipher>> CryCiphers::SUPPORTED_CIPHERS = {
+        make_shared<CryCipherInstance<AES256_GCM>>("aes-256-gcm"),
+        make_shared<CryCipherInstance<AES256_CFB>>("aes-256-cfb"),
+        make_shared<CryCipherInstance<AES128_GCM>>("aes-128-gcm"),
+        make_shared<CryCipherInstance<AES128_CFB>>("aes-128-cfb"),
+        make_shared<CryCipherInstance<Twofish256_GCM>>("twofish-256-gcm"),
+        make_shared<CryCipherInstance<Twofish256_CFB>>("twofish-256-cfb"),
+        make_shared<CryCipherInstance<Twofish128_GCM>>("twofish-128-gcm"),
+        make_shared<CryCipherInstance<Twofish128_CFB>>("twofish-128-cfb"),
+        make_shared<CryCipherInstance<Serpent256_GCM>>("serpent-256-gcm"),
+        make_shared<CryCipherInstance<Serpent256_CFB>>("serpent-256-cfb"),
+        make_shared<CryCipherInstance<Serpent128_GCM>>("serpent-128-gcm"),
+        make_shared<CryCipherInstance<Serpent128_CFB>>("serpent-128-cfb"),
+        make_shared<CryCipherInstance<Cast256_GCM>>("cast-256-gcm"),
+        make_shared<CryCipherInstance<Cast256_CFB>>("cast-256-cfb"),
+        make_shared<CryCipherInstance<Mars448_GCM>>("mars-448-gcm"),
+        make_shared<CryCipherInstance<Mars448_CFB>>("mars-448-cfb"),
+        make_shared<CryCipherInstance<Mars256_GCM>>("mars-256-gcm"),
+        make_shared<CryCipherInstance<Mars256_CFB>>("mars-256-cfb"),
+        make_shared<CryCipherInstance<Mars128_GCM>>("mars-128-gcm"),
+        make_shared<CryCipherInstance<Mars128_CFB>>("mars-128-cfb")
+};
+
+const CryCipher& CryCiphers::find(const string &cipherName) {
+    auto found = std::find_if(CryCiphers::SUPPORTED_CIPHERS.begin(), CryCiphers::SUPPORTED_CIPHERS.end(),
+                              [cipherName] (const auto& element) {
+                                  return element->cipherName() == cipherName;
+                              });
+    ASSERT(found != CryCiphers::SUPPORTED_CIPHERS.end(), "Unknown Cipher");
+    return **found;
+}
+
+vector<string> CryCiphers::supportedCiphers() {
+    vector<string> result;
+    for (const auto& cipher : CryCiphers::SUPPORTED_CIPHERS) {
+        result.push_back(cipher->cipherName());
+    }
+    return result;
+}

src/CryCipher.h

@@ -0,0 +1,30 @@
+#ifndef CRYFS_CRYCIPHER_H
+#define CRYFS_CRYCIPHER_H
+
+#include <vector>
+#include <string>
+#include <messmer/cpp-utils/pointer/unique_ref.h>
+#include <messmer/blockstore/interface/BlockStore.h>
+
+namespace cryfs {
+
+class CryCipher {
+public:
+    virtual std::string cipherName() const = 0;
+    virtual cpputils::unique_ref<blockstore::BlockStore> createEncryptedBlockstore(cpputils::unique_ref<blockstore::BlockStore> baseBlockStore, const std::string &encKey) const = 0;
+    virtual std::string createKey() const = 0;
+};
+
+class CryCiphers {
+public:
+    static std::vector<std::string> supportedCiphers();
+
+    static const CryCipher& find(const std::string &cipherName);
+
+private:
+    static const std::vector<std::shared_ptr<CryCipher>> SUPPORTED_CIPHERS;
+};
+
+}
+
+#endif

src/CryConfigLoader.cpp

@@ -43,24 +43,23 @@ void CryConfigLoader::_initializeConfigWithWeakKey(CryConfig *config) {
 }
 
 void CryConfigLoader::_generateCipher(CryConfig *config) {
-  vector<string> ciphers = {"aes-256-gcm", "aes-256-cfb"};
+  vector<string> ciphers = CryCiphers::supportedCiphers();
   int cipherIndex = _console->ask("Which block cipher do you want to use?", ciphers);
   config->SetCipher(ciphers[cipherIndex]);
 }
 
+void CryConfigLoader::_generateEncKey(CryConfig *config) {
+  _console->print("Generating secure encryption key...");
+  config->SetEncryptionKey(CryCiphers::find(config->Cipher()).createKey());
+  _console->print("done\n");
+}
+
 void CryConfigLoader::_generateTestCipher(CryConfig *config) {
   config->SetCipher("aes-256-gcm");
 }
 
-void CryConfigLoader::_generateEncKey(CryConfig *config) {
-  _console->print("Generating secure encryption key...");
-  auto new_key = Cipher::EncryptionKey::CreateOSRandom();
-  config->SetEncryptionKey(new_key.ToString());
-  _console->print("done\n");
-}
-
 void CryConfigLoader::_generateWeakEncKey(CryConfig *config) {
-  auto new_key = Cipher::EncryptionKey::CreatePseudoRandom();
+  auto new_key = blockstore::encrypted::AES256_GCM::EncryptionKey::CreatePseudoRandom();
   config->SetEncryptionKey(new_key.ToString());
 }
 

src/CryConfigLoader.h

@@ -5,16 +5,14 @@
 #include <messmer/cpp-utils/pointer/unique_ref.h>
 #include <boost/filesystem/path.hpp>
 #include "CryConfig.h"
-#include <messmer/blockstore/implementations/encrypted/ciphers/AES256_GCM.h>
+#include "CryCipher.h"
+#include <messmer/blockstore/implementations/encrypted/ciphers/ciphers.h>
 #include "utils/Console.h"
 
 namespace cryfs {
 
 class CryConfigLoader {
 public:
-  //TODO Get rid of this and use dynamically configured Cipher instead
-  using Cipher = blockstore::encrypted::AES256_GCM;
-
   CryConfigLoader();
   explicit CryConfigLoader(cpputils::unique_ref<Console> console);
 

src/CryDevice.cpp

@@ -1,5 +1,5 @@
 #include <messmer/blockstore/implementations/caching/CachingBlockStore.h>
-#include <messmer/blockstore/implementations/encrypted/ciphers/AES256_CFB.h>
+#include <messmer/blockstore/implementations/encrypted/ciphers/ciphers.h>
 #include "impl/DirBlob.h"
 #include "CryDevice.h"
 
@@ -133,18 +133,8 @@ Key CryDevice::GetOrCreateRootKey(CryConfig *config) {
 }
 
 cpputils::unique_ref<blockstore::BlockStore> CryDevice::CreateEncryptedBlockStore(const CryConfig &config, unique_ref<BlockStore> baseBlockStore) {
-  //TODO Can we somehow ensure that the if/else chain here doesn't forget a valid value?
   //TODO Test that CryFS is using the specified cipher
-  std::string cipherName = config.Cipher();
+  return CryCiphers::find(config.Cipher()).createEncryptedBlockstore(std::move(baseBlockStore), config.EncryptionKey());
-  if (cipherName == "aes-256-gcm") {
-    using Cipher = blockstore::encrypted::AES256_GCM;
-    return make_unique_ref<EncryptedBlockStore<Cipher>>(std::move(baseBlockStore), Cipher::EncryptionKey::FromString(config.EncryptionKey()));
-  } else if (cipherName == "aes-256-cfb") {
-    using Cipher = blockstore::encrypted::AES256_CFB;
-    return make_unique_ref<EncryptedBlockStore<Cipher>>(std::move(baseBlockStore), Cipher::EncryptionKey::FromString(config.EncryptionKey()));
-  } else {
-    ASSERT(false, "Unknown cipher");
-  }
 }
 
 }