Fix config loading

This commit is contained in:
Sebastian Messmer 2015-10-26 20:14:41 +01:00
parent aceeb2644f
commit adad371114
4 changed files with 5 additions and 0 deletions

View File

@ -16,6 +16,8 @@ GIT_VERSION_INIT()
ENABLE_STYLE_WARNINGS() ENABLE_STYLE_WARNINGS()
INSTALL(TARGETS ${BII_src_main_target} DESTINATION bin RENAME cryfs)
# You can safely delete lines from here... # You can safely delete lines from here...
############################################################################### ###############################################################################

View File

@ -8,6 +8,7 @@
#include "CryConfigEncryptor.h" #include "CryConfigEncryptor.h"
namespace cryfs { namespace cryfs {
//TODO Test
template<class Cipher> template<class Cipher>
class ConcreteCryConfigEncryptor: public CryConfigEncryptor { class ConcreteCryConfigEncryptor: public CryConfigEncryptor {
public: public:

View File

@ -7,6 +7,7 @@
#include "kdf/Scrypt.h" #include "kdf/Scrypt.h"
namespace cryfs { namespace cryfs {
//TODO Test
class CryConfigEncryptorFactory { class CryConfigEncryptorFactory {
public: public:
template<class Cipher> template<class Cipher>

View File

@ -96,6 +96,7 @@ CryConfigFile loadOrCreateConfig(const ProgramOptions &options) {
std::cerr << "Could not load config file. Did you enter the correct password?" << std::endl; std::cerr << "Could not load config file. Did you enter the correct password?" << std::endl;
exit(1); exit(1);
} }
return std::move(*config);
} catch (const std::exception &e) { } catch (const std::exception &e) {
std::cerr << "Error: " << e.what() << std::endl; std::cerr << "Error: " << e.what() << std::endl;
exit(1); exit(1);