Fix config loading
This commit is contained in:
parent
aceeb2644f
commit
adad371114
@ -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...
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
@ -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:
|
||||||
|
@ -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>
|
||||||
|
@ -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);
|
||||||
|
Loading…
Reference in New Issue
Block a user