From b2f9e5cc6006c43658e11debb4941eb052490ac5 Mon Sep 17 00:00:00 2001 From: Sebastian Messmer Date: Fri, 25 Jan 2019 23:38:34 -0800 Subject: [PATCH] Move cryfs code into impl/ subfolder --- src/cryfs-cli/Cli.cpp | 14 +-- src/cryfs-cli/Cli.h | 8 +- src/cryfs-cli/main.cpp | 2 +- src/cryfs-cli/program_options/Parser.cpp | 4 +- src/cryfs-cli/program_options/Parser.h | 2 +- src/cryfs-unmount/Cli.cpp | 2 +- src/cryfs-unmount/main_unmount.cpp | 2 +- src/cryfs-unmount/program_options/Parser.cpp | 4 +- src/cryfs-unmount/program_options/Parser.h | 2 +- src/cryfs/CMakeLists.txt | 90 +++++++++---------- src/cryfs/{ => impl}/CryfsException.cpp | 0 src/cryfs/{ => impl}/CryfsException.h | 0 src/cryfs/{ => impl}/ErrorCodes.h | 0 src/cryfs/{ => impl}/config/CryCipher.cpp | 2 +- src/cryfs/{ => impl}/config/CryCipher.h | 2 +- src/cryfs/{ => impl}/config/CryConfig.cpp | 0 src/cryfs/{ => impl}/config/CryConfig.h | 0 .../{ => impl}/config/CryConfigConsole.cpp | 0 .../{ => impl}/config/CryConfigConsole.h | 0 .../{ => impl}/config/CryConfigCreator.cpp | 4 +- .../{ => impl}/config/CryConfigCreator.h | 2 +- src/cryfs/{ => impl}/config/CryConfigFile.cpp | 0 src/cryfs/{ => impl}/config/CryConfigFile.h | 2 +- .../{ => impl}/config/CryConfigLoader.cpp | 6 +- src/cryfs/{ => impl}/config/CryConfigLoader.h | 0 .../{ => impl}/config/CryKeyProvider.cpp | 0 src/cryfs/{ => impl}/config/CryKeyProvider.h | 0 .../config/CryPasswordBasedKeyProvider.cpp | 0 .../config/CryPasswordBasedKeyProvider.h | 0 .../CryPresetPasswordBasedKeyProvider.cpp | 0 .../CryPresetPasswordBasedKeyProvider.h | 0 .../config/crypto/CryConfigEncryptor.cpp | 0 .../config/crypto/CryConfigEncryptor.h | 6 +- .../crypto/CryConfigEncryptorFactory.cpp | 4 +- .../config/crypto/CryConfigEncryptorFactory.h | 4 +- .../crypto/inner/ConcreteInnerEncryptor.cpp | 0 .../crypto/inner/ConcreteInnerEncryptor.h | 0 .../config/crypto/inner/InnerConfig.cpp | 0 .../config/crypto/inner/InnerConfig.h | 0 .../config/crypto/inner/InnerEncryptor.cpp | 0 .../config/crypto/inner/InnerEncryptor.h | 0 .../config/crypto/outer/OuterConfig.cpp | 0 .../config/crypto/outer/OuterConfig.h | 0 .../config/crypto/outer/OuterEncryptor.cpp | 0 .../config/crypto/outer/OuterEncryptor.h | 0 src/cryfs/{ => impl}/filesystem/CryDevice.cpp | 12 +-- src/cryfs/{ => impl}/filesystem/CryDevice.h | 12 +-- src/cryfs/{ => impl}/filesystem/CryDir.cpp | 2 +- src/cryfs/{ => impl}/filesystem/CryDir.h | 2 +- src/cryfs/{ => impl}/filesystem/CryFile.cpp | 0 src/cryfs/{ => impl}/filesystem/CryFile.h | 4 +- src/cryfs/{ => impl}/filesystem/CryNode.cpp | 0 src/cryfs/{ => impl}/filesystem/CryNode.h | 2 +- .../{ => impl}/filesystem/CryOpenFile.cpp | 0 src/cryfs/{ => impl}/filesystem/CryOpenFile.h | 4 +- .../{ => impl}/filesystem/CrySymlink.cpp | 4 +- src/cryfs/{ => impl}/filesystem/CrySymlink.h | 4 +- .../cachingfsblobstore/CachingFsBlobStore.cpp | 2 +- .../cachingfsblobstore/CachingFsBlobStore.h | 2 +- .../cachingfsblobstore/DirBlobRef.cpp | 0 .../cachingfsblobstore/DirBlobRef.h | 4 +- .../cachingfsblobstore/FileBlobRef.cpp | 0 .../cachingfsblobstore/FileBlobRef.h | 2 +- .../cachingfsblobstore/FsBlobRef.cpp | 0 .../filesystem/cachingfsblobstore/FsBlobRef.h | 2 +- .../cachingfsblobstore/SymlinkBlobRef.cpp | 0 .../cachingfsblobstore/SymlinkBlobRef.h | 2 +- .../filesystem/fsblobstore/DirBlob.cpp | 2 +- .../filesystem/fsblobstore/DirBlob.h | 2 +- .../filesystem/fsblobstore/FileBlob.cpp | 0 .../filesystem/fsblobstore/FileBlob.h | 0 .../filesystem/fsblobstore/FsBlob.cpp | 0 .../filesystem/fsblobstore/FsBlob.h | 0 .../filesystem/fsblobstore/FsBlobStore.cpp | 0 .../filesystem/fsblobstore/FsBlobStore.h | 0 .../filesystem/fsblobstore/FsBlobView.cpp | 0 .../filesystem/fsblobstore/FsBlobView.h | 0 .../filesystem/fsblobstore/SymlinkBlob.cpp | 0 .../filesystem/fsblobstore/SymlinkBlob.h | 0 .../filesystem/fsblobstore/utils/DirEntry.cpp | 0 .../filesystem/fsblobstore/utils/DirEntry.h | 0 .../fsblobstore/utils/DirEntryList.cpp | 0 .../fsblobstore/utils/DirEntryList.h | 0 .../utils/TimestampUpdateBehavior.h | 0 .../parallelaccessfsblobstore/DirBlobRef.cpp | 0 .../parallelaccessfsblobstore/DirBlobRef.h | 4 +- .../parallelaccessfsblobstore/FileBlobRef.cpp | 0 .../parallelaccessfsblobstore/FileBlobRef.h | 2 +- .../parallelaccessfsblobstore/FsBlobRef.cpp | 0 .../parallelaccessfsblobstore/FsBlobRef.h | 2 +- .../ParallelAccessFsBlobStore.cpp | 2 +- .../ParallelAccessFsBlobStore.h | 2 +- .../ParallelAccessFsBlobStoreAdapter.cpp | 0 .../ParallelAccessFsBlobStoreAdapter.h | 2 +- .../SymlinkBlobRef.cpp | 0 .../SymlinkBlobRef.h | 2 +- .../{ => impl}/localstate/BasedirMetadata.cpp | 0 .../{ => impl}/localstate/BasedirMetadata.h | 0 .../{ => impl}/localstate/LocalStateDir.cpp | 0 .../{ => impl}/localstate/LocalStateDir.h | 0 .../localstate/LocalStateMetadata.cpp | 2 +- .../localstate/LocalStateMetadata.h | 0 src/stats/main.cpp | 10 +-- test/cryfs-cli/CliTest_IntegrityCheck.cpp | 6 +- test/cryfs-cli/program_options/ParserTest.cpp | 4 +- test/cryfs-cli/testutils/CliTest.h | 6 +- test/cryfs/CMakeLists.txt | 40 ++++----- .../{ => impl}/config/CompatibilityTest.cpp | 6 +- .../cryfs/{ => impl}/config/CryCipherTest.cpp | 2 +- .../config/CryConfigConsoleTest.cpp | 6 +- .../config/CryConfigCreatorTest.cpp | 10 +-- .../{ => impl}/config/CryConfigFileTest.cpp | 4 +- .../{ => impl}/config/CryConfigLoaderTest.cpp | 8 +- .../cryfs/{ => impl}/config/CryConfigTest.cpp | 2 +- .../CryPasswordBasedKeyProviderTest.cpp | 4 +- .../CryPresetPasswordBasedKeyProviderTest.cpp | 4 +- .../crypto/CryConfigEncryptorFactoryTest.cpp | 4 +- .../config/crypto/CryConfigEncryptorTest.cpp | 2 +- .../inner/ConcreteInnerEncryptorTest.cpp | 2 +- .../config/crypto/inner/InnerConfigTest.cpp | 2 +- .../config/crypto/outer/OuterConfigTest.cpp | 2 +- .../crypto/outer/OuterEncryptorTest.cpp | 2 +- .../cryfs/{ => impl}/filesystem/CryFsTest.cpp | 12 +-- .../{ => impl}/filesystem/CryNodeTest.cpp | 6 +- .../{ => impl}/filesystem/FileSystemTest.cpp | 6 +- .../filesystem/testutils/CryTestBase.h | 4 +- .../localstate/BasedirMetadataTest.cpp | 6 +- .../localstate/LocalStateMetadataTest.cpp | 2 +- .../{ => impl}/testutils/FakeCryKeyProvider.h | 2 +- test/cryfs/{ => impl}/testutils/MockConsole.h | 0 .../{ => impl}/testutils/MockCryKeyProvider.h | 2 +- .../testutils/TestWithFakeHomeDirectory.h | 0 132 files changed, 205 insertions(+), 205 deletions(-) rename src/cryfs/{ => impl}/CryfsException.cpp (100%) rename src/cryfs/{ => impl}/CryfsException.h (100%) rename src/cryfs/{ => impl}/ErrorCodes.h (100%) rename src/cryfs/{ => impl}/config/CryCipher.cpp (98%) rename src/cryfs/{ => impl}/config/CryCipher.h (96%) rename src/cryfs/{ => impl}/config/CryConfig.cpp (100%) rename src/cryfs/{ => impl}/config/CryConfig.h (100%) rename src/cryfs/{ => impl}/config/CryConfigConsole.cpp (100%) rename src/cryfs/{ => impl}/config/CryConfigConsole.h (100%) rename src/cryfs/{ => impl}/config/CryConfigCreator.cpp (97%) rename src/cryfs/{ => impl}/config/CryConfigCreator.h (97%) rename src/cryfs/{ => impl}/config/CryConfigFile.cpp (100%) rename src/cryfs/{ => impl}/config/CryConfigFile.h (94%) rename src/cryfs/{ => impl}/config/CryConfigLoader.cpp (98%) rename src/cryfs/{ => impl}/config/CryConfigLoader.h (100%) rename src/cryfs/{ => impl}/config/CryKeyProvider.cpp (100%) rename src/cryfs/{ => impl}/config/CryKeyProvider.h (100%) rename src/cryfs/{ => impl}/config/CryPasswordBasedKeyProvider.cpp (100%) rename src/cryfs/{ => impl}/config/CryPasswordBasedKeyProvider.h (100%) rename src/cryfs/{ => impl}/config/CryPresetPasswordBasedKeyProvider.cpp (100%) rename src/cryfs/{ => impl}/config/CryPresetPasswordBasedKeyProvider.h (100%) rename src/cryfs/{ => impl}/config/crypto/CryConfigEncryptor.cpp (100%) rename src/cryfs/{ => impl}/config/crypto/CryConfigEncryptor.h (89%) rename src/cryfs/{ => impl}/config/crypto/CryConfigEncryptorFactory.cpp (94%) rename src/cryfs/{ => impl}/config/crypto/CryConfigEncryptorFactory.h (87%) rename src/cryfs/{ => impl}/config/crypto/inner/ConcreteInnerEncryptor.cpp (100%) rename src/cryfs/{ => impl}/config/crypto/inner/ConcreteInnerEncryptor.h (100%) rename src/cryfs/{ => impl}/config/crypto/inner/InnerConfig.cpp (100%) rename src/cryfs/{ => impl}/config/crypto/inner/InnerConfig.h (100%) rename src/cryfs/{ => impl}/config/crypto/inner/InnerEncryptor.cpp (100%) rename src/cryfs/{ => impl}/config/crypto/inner/InnerEncryptor.h (100%) rename src/cryfs/{ => impl}/config/crypto/outer/OuterConfig.cpp (100%) rename src/cryfs/{ => impl}/config/crypto/outer/OuterConfig.h (100%) rename src/cryfs/{ => impl}/config/crypto/outer/OuterEncryptor.cpp (100%) rename src/cryfs/{ => impl}/config/crypto/outer/OuterEncryptor.h (100%) rename src/cryfs/{ => impl}/filesystem/CryDevice.cpp (97%) rename src/cryfs/{ => impl}/filesystem/CryDevice.h (91%) rename src/cryfs/{ => impl}/filesystem/CryDir.cpp (98%) rename src/cryfs/{ => impl}/filesystem/CryDir.h (94%) rename src/cryfs/{ => impl}/filesystem/CryFile.cpp (100%) rename src/cryfs/{ => impl}/filesystem/CryFile.h (85%) rename src/cryfs/{ => impl}/filesystem/CryNode.cpp (100%) rename src/cryfs/{ => impl}/filesystem/CryNode.h (96%) rename src/cryfs/{ => impl}/filesystem/CryOpenFile.cpp (100%) rename src/cryfs/{ => impl}/filesystem/CryOpenFile.h (87%) rename src/cryfs/{ => impl}/filesystem/CrySymlink.cpp (91%) rename src/cryfs/{ => impl}/filesystem/CrySymlink.h (83%) rename src/cryfs/{ => impl}/filesystem/cachingfsblobstore/CachingFsBlobStore.cpp (96%) rename src/cryfs/{ => impl}/filesystem/cachingfsblobstore/CachingFsBlobStore.h (98%) rename src/cryfs/{ => impl}/filesystem/cachingfsblobstore/DirBlobRef.cpp (100%) rename src/cryfs/{ => impl}/filesystem/cachingfsblobstore/DirBlobRef.h (97%) rename src/cryfs/{ => impl}/filesystem/cachingfsblobstore/FileBlobRef.cpp (100%) rename src/cryfs/{ => impl}/filesystem/cachingfsblobstore/FileBlobRef.h (96%) rename src/cryfs/{ => impl}/filesystem/cachingfsblobstore/FsBlobRef.cpp (100%) rename src/cryfs/{ => impl}/filesystem/cachingfsblobstore/FsBlobRef.h (95%) rename src/cryfs/{ => impl}/filesystem/cachingfsblobstore/SymlinkBlobRef.cpp (100%) rename src/cryfs/{ => impl}/filesystem/cachingfsblobstore/SymlinkBlobRef.h (94%) rename src/cryfs/{ => impl}/filesystem/fsblobstore/DirBlob.cpp (99%) rename src/cryfs/{ => impl}/filesystem/fsblobstore/DirBlob.h (98%) rename src/cryfs/{ => impl}/filesystem/fsblobstore/FileBlob.cpp (100%) rename src/cryfs/{ => impl}/filesystem/fsblobstore/FileBlob.h (100%) rename src/cryfs/{ => impl}/filesystem/fsblobstore/FsBlob.cpp (100%) rename src/cryfs/{ => impl}/filesystem/fsblobstore/FsBlob.h (100%) rename src/cryfs/{ => impl}/filesystem/fsblobstore/FsBlobStore.cpp (100%) rename src/cryfs/{ => impl}/filesystem/fsblobstore/FsBlobStore.h (100%) rename src/cryfs/{ => impl}/filesystem/fsblobstore/FsBlobView.cpp (100%) rename src/cryfs/{ => impl}/filesystem/fsblobstore/FsBlobView.h (100%) rename src/cryfs/{ => impl}/filesystem/fsblobstore/SymlinkBlob.cpp (100%) rename src/cryfs/{ => impl}/filesystem/fsblobstore/SymlinkBlob.h (100%) rename src/cryfs/{ => impl}/filesystem/fsblobstore/utils/DirEntry.cpp (100%) rename src/cryfs/{ => impl}/filesystem/fsblobstore/utils/DirEntry.h (100%) rename src/cryfs/{ => impl}/filesystem/fsblobstore/utils/DirEntryList.cpp (100%) rename src/cryfs/{ => impl}/filesystem/fsblobstore/utils/DirEntryList.h (100%) rename src/cryfs/{ => impl}/filesystem/fsblobstore/utils/TimestampUpdateBehavior.h (100%) rename src/cryfs/{ => impl}/filesystem/parallelaccessfsblobstore/DirBlobRef.cpp (100%) rename src/cryfs/{ => impl}/filesystem/parallelaccessfsblobstore/DirBlobRef.h (96%) rename src/cryfs/{ => impl}/filesystem/parallelaccessfsblobstore/FileBlobRef.cpp (100%) rename src/cryfs/{ => impl}/filesystem/parallelaccessfsblobstore/FileBlobRef.h (95%) rename src/cryfs/{ => impl}/filesystem/parallelaccessfsblobstore/FsBlobRef.cpp (100%) rename src/cryfs/{ => impl}/filesystem/parallelaccessfsblobstore/FsBlobRef.h (92%) rename src/cryfs/{ => impl}/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStore.cpp (98%) rename src/cryfs/{ => impl}/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStore.h (97%) rename src/cryfs/{ => impl}/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStoreAdapter.cpp (100%) rename src/cryfs/{ => impl}/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStoreAdapter.h (94%) rename src/cryfs/{ => impl}/filesystem/parallelaccessfsblobstore/SymlinkBlobRef.cpp (100%) rename src/cryfs/{ => impl}/filesystem/parallelaccessfsblobstore/SymlinkBlobRef.h (93%) rename src/cryfs/{ => impl}/localstate/BasedirMetadata.cpp (100%) rename src/cryfs/{ => impl}/localstate/BasedirMetadata.h (100%) rename src/cryfs/{ => impl}/localstate/LocalStateDir.cpp (100%) rename src/cryfs/{ => impl}/localstate/LocalStateDir.h (100%) rename src/cryfs/{ => impl}/localstate/LocalStateMetadata.cpp (99%) rename src/cryfs/{ => impl}/localstate/LocalStateMetadata.h (100%) rename test/cryfs/{ => impl}/config/CompatibilityTest.cpp (97%) rename test/cryfs/{ => impl}/config/CryCipherTest.cpp (99%) rename test/cryfs/{ => impl}/config/CryConfigConsoleTest.cpp (97%) rename test/cryfs/{ => impl}/config/CryConfigCreatorTest.cpp (97%) rename test/cryfs/{ => impl}/config/CryConfigFileTest.cpp (98%) rename test/cryfs/{ => impl}/config/CryConfigLoaderTest.cpp (98%) rename test/cryfs/{ => impl}/config/CryConfigTest.cpp (99%) rename test/cryfs/{ => impl}/config/CryPasswordBasedKeyProviderTest.cpp (96%) rename test/cryfs/{ => impl}/config/CryPresetPasswordBasedKeyProviderTest.cpp (95%) rename test/cryfs/{ => impl}/config/crypto/CryConfigEncryptorFactoryTest.cpp (95%) rename test/cryfs/{ => impl}/config/crypto/CryConfigEncryptorTest.cpp (98%) rename test/cryfs/{ => impl}/config/crypto/inner/ConcreteInnerEncryptorTest.cpp (98%) rename test/cryfs/{ => impl}/config/crypto/inner/InnerConfigTest.cpp (97%) rename test/cryfs/{ => impl}/config/crypto/outer/OuterConfigTest.cpp (97%) rename test/cryfs/{ => impl}/config/crypto/outer/OuterEncryptorTest.cpp (97%) rename test/cryfs/{ => impl}/filesystem/CryFsTest.cpp (90%) rename test/cryfs/{ => impl}/filesystem/CryNodeTest.cpp (96%) rename test/cryfs/{ => impl}/filesystem/FileSystemTest.cpp (92%) rename test/cryfs/{ => impl}/filesystem/testutils/CryTestBase.h (94%) rename test/cryfs/{ => impl}/localstate/BasedirMetadataTest.cpp (95%) rename test/cryfs/{ => impl}/localstate/LocalStateMetadataTest.cpp (97%) rename test/cryfs/{ => impl}/testutils/FakeCryKeyProvider.h (96%) rename test/cryfs/{ => impl}/testutils/MockConsole.h (100%) rename test/cryfs/{ => impl}/testutils/MockCryKeyProvider.h (89%) rename test/cryfs/{ => impl}/testutils/TestWithFakeHomeDirectory.h (100%) diff --git a/src/cryfs-cli/Cli.cpp b/src/cryfs-cli/Cli.cpp index 73e5642b..8481f562 100644 --- a/src/cryfs-cli/Cli.cpp +++ b/src/cryfs-cli/Cli.cpp @@ -10,22 +10,22 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include "program_options/Parser.h" #include -#include +#include #include #include "VersionChecker.h" #include #include -#include -#include +#include +#include #include "Environment.h" -#include +#include #include //TODO Many functions accessing the ProgramOptions object. Factor out into class that stores it as a member. diff --git a/src/cryfs-cli/Cli.h b/src/cryfs-cli/Cli.h index bdffaa54..a077dd78 100644 --- a/src/cryfs-cli/Cli.h +++ b/src/cryfs-cli/Cli.h @@ -3,16 +3,16 @@ #define MESSMER_CRYFSCLI_CLI_H #include "program_options/ProgramOptions.h" -#include +#include #include #include #include #include #include -#include +#include #include "CallAfterTimeout.h" -#include -#include +#include +#include namespace cryfs_cli { class Cli final { diff --git a/src/cryfs-cli/main.cpp b/src/cryfs-cli/main.cpp index 6c22adfa..cb78e950 100644 --- a/src/cryfs-cli/main.cpp +++ b/src/cryfs-cli/main.cpp @@ -1,7 +1,7 @@ #include "Cli.h" #include #include -#include +#include #if defined(_MSC_VER) #include diff --git a/src/cryfs-cli/program_options/Parser.cpp b/src/cryfs-cli/program_options/Parser.cpp index 019245d7..deb792c9 100644 --- a/src/cryfs-cli/program_options/Parser.cpp +++ b/src/cryfs-cli/program_options/Parser.cpp @@ -2,8 +2,8 @@ #include "utils.h" #include #include -#include -#include +#include +#include #include namespace po = boost::program_options; diff --git a/src/cryfs-cli/program_options/Parser.h b/src/cryfs-cli/program_options/Parser.h index 735c2b8d..ff5b4152 100644 --- a/src/cryfs-cli/program_options/Parser.h +++ b/src/cryfs-cli/program_options/Parser.h @@ -4,7 +4,7 @@ #include "ProgramOptions.h" #include -#include +#include namespace cryfs_cli { namespace program_options { diff --git a/src/cryfs-unmount/Cli.cpp b/src/cryfs-unmount/Cli.cpp index aa5c06f2..e3badc24 100644 --- a/src/cryfs-unmount/Cli.cpp +++ b/src/cryfs-unmount/Cli.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include diff --git a/src/cryfs-unmount/main_unmount.cpp b/src/cryfs-unmount/main_unmount.cpp index b3e2637c..e84e3e6f 100644 --- a/src/cryfs-unmount/main_unmount.cpp +++ b/src/cryfs-unmount/main_unmount.cpp @@ -4,7 +4,7 @@ #endif #include -#include +#include #include #include "Cli.h" diff --git a/src/cryfs-unmount/program_options/Parser.cpp b/src/cryfs-unmount/program_options/Parser.cpp index 25e27951..8f5f9d2d 100644 --- a/src/cryfs-unmount/program_options/Parser.cpp +++ b/src/cryfs-unmount/program_options/Parser.cpp @@ -1,8 +1,8 @@ #include "Parser.h" #include #include -#include -#include +#include +#include #include namespace po = boost::program_options; diff --git a/src/cryfs-unmount/program_options/Parser.h b/src/cryfs-unmount/program_options/Parser.h index 6f98eb1f..ea5931fa 100644 --- a/src/cryfs-unmount/program_options/Parser.h +++ b/src/cryfs-unmount/program_options/Parser.h @@ -4,7 +4,7 @@ #include "ProgramOptions.h" #include -#include +#include namespace cryfs_unmount { namespace program_options { diff --git a/src/cryfs/CMakeLists.txt b/src/cryfs/CMakeLists.txt index 62d358de..383582e7 100644 --- a/src/cryfs/CMakeLists.txt +++ b/src/cryfs/CMakeLists.txt @@ -2,51 +2,51 @@ project (cryfs) set(LIB_SOURCES # cryfs.cpp - CryfsException.cpp - config/crypto/outer/OuterConfig.cpp - config/crypto/outer/OuterEncryptor.cpp - config/crypto/CryConfigEncryptorFactory.cpp - config/crypto/inner/ConcreteInnerEncryptor.cpp - config/crypto/inner/InnerConfig.cpp - config/crypto/inner/InnerEncryptor.cpp - config/crypto/CryConfigEncryptor.cpp - config/CryConfigConsole.cpp - config/CryConfigLoader.cpp - config/CryConfig.cpp - config/CryConfigFile.cpp - config/CryCipher.cpp - config/CryConfigCreator.cpp - config/CryKeyProvider.cpp - config/CryPasswordBasedKeyProvider.cpp - config/CryPresetPasswordBasedKeyProvider.cpp - filesystem/CryOpenFile.cpp - filesystem/fsblobstore/utils/DirEntry.cpp - filesystem/fsblobstore/utils/DirEntryList.cpp - filesystem/fsblobstore/FsBlobStore.cpp - filesystem/fsblobstore/FsBlobView.cpp - filesystem/fsblobstore/FileBlob.cpp - filesystem/fsblobstore/FsBlob.cpp - filesystem/fsblobstore/SymlinkBlob.cpp - filesystem/fsblobstore/DirBlob.cpp - filesystem/CryNode.cpp - filesystem/parallelaccessfsblobstore/DirBlobRef.cpp - filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStore.cpp - filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStoreAdapter.cpp - filesystem/parallelaccessfsblobstore/FsBlobRef.cpp - filesystem/parallelaccessfsblobstore/FileBlobRef.cpp - filesystem/parallelaccessfsblobstore/SymlinkBlobRef.cpp - filesystem/CrySymlink.cpp - filesystem/CryDir.cpp - filesystem/cachingfsblobstore/DirBlobRef.cpp - filesystem/cachingfsblobstore/CachingFsBlobStore.cpp - filesystem/cachingfsblobstore/FsBlobRef.cpp - filesystem/cachingfsblobstore/FileBlobRef.cpp - filesystem/cachingfsblobstore/SymlinkBlobRef.cpp - filesystem/CryFile.cpp - filesystem/CryDevice.cpp - localstate/LocalStateDir.cpp - localstate/LocalStateMetadata.cpp - localstate/BasedirMetadata.cpp + impl/CryfsException.cpp + impl/config/crypto/outer/OuterConfig.cpp + impl/config/crypto/outer/OuterEncryptor.cpp + impl/config/crypto/CryConfigEncryptorFactory.cpp + impl/config/crypto/inner/ConcreteInnerEncryptor.cpp + impl/config/crypto/inner/InnerConfig.cpp + impl/config/crypto/inner/InnerEncryptor.cpp + impl/config/crypto/CryConfigEncryptor.cpp + impl/config/CryConfigConsole.cpp + impl/config/CryConfigLoader.cpp + impl/config/CryConfig.cpp + impl/config/CryConfigFile.cpp + impl/config/CryCipher.cpp + impl/config/CryConfigCreator.cpp + impl/config/CryKeyProvider.cpp + impl/config/CryPasswordBasedKeyProvider.cpp + impl/config/CryPresetPasswordBasedKeyProvider.cpp + impl/filesystem/CryOpenFile.cpp + impl/filesystem/fsblobstore/utils/DirEntry.cpp + impl/filesystem/fsblobstore/utils/DirEntryList.cpp + impl/filesystem/fsblobstore/FsBlobStore.cpp + impl/filesystem/fsblobstore/FsBlobView.cpp + impl/filesystem/fsblobstore/FileBlob.cpp + impl/filesystem/fsblobstore/FsBlob.cpp + impl/filesystem/fsblobstore/SymlinkBlob.cpp + impl/filesystem/fsblobstore/DirBlob.cpp + impl/filesystem/CryNode.cpp + impl/filesystem/parallelaccessfsblobstore/DirBlobRef.cpp + impl/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStore.cpp + impl/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStoreAdapter.cpp + impl/filesystem/parallelaccessfsblobstore/FsBlobRef.cpp + impl/filesystem/parallelaccessfsblobstore/FileBlobRef.cpp + impl/filesystem/parallelaccessfsblobstore/SymlinkBlobRef.cpp + impl/filesystem/CrySymlink.cpp + impl/filesystem/CryDir.cpp + impl/filesystem/cachingfsblobstore/DirBlobRef.cpp + impl/filesystem/cachingfsblobstore/CachingFsBlobStore.cpp + impl/filesystem/cachingfsblobstore/FsBlobRef.cpp + impl/filesystem/cachingfsblobstore/FileBlobRef.cpp + impl/filesystem/cachingfsblobstore/SymlinkBlobRef.cpp + impl/filesystem/CryFile.cpp + impl/filesystem/CryDevice.cpp + impl/localstate/LocalStateDir.cpp + impl/localstate/LocalStateMetadata.cpp + impl/localstate/BasedirMetadata.cpp ) add_library(${PROJECT_NAME} STATIC ${LIB_SOURCES}) diff --git a/src/cryfs/CryfsException.cpp b/src/cryfs/impl/CryfsException.cpp similarity index 100% rename from src/cryfs/CryfsException.cpp rename to src/cryfs/impl/CryfsException.cpp diff --git a/src/cryfs/CryfsException.h b/src/cryfs/impl/CryfsException.h similarity index 100% rename from src/cryfs/CryfsException.h rename to src/cryfs/impl/CryfsException.h diff --git a/src/cryfs/ErrorCodes.h b/src/cryfs/impl/ErrorCodes.h similarity index 100% rename from src/cryfs/ErrorCodes.h rename to src/cryfs/impl/ErrorCodes.h diff --git a/src/cryfs/config/CryCipher.cpp b/src/cryfs/impl/config/CryCipher.cpp similarity index 98% rename from src/cryfs/config/CryCipher.cpp rename to src/cryfs/impl/config/CryCipher.cpp index 52749847..8b1cfbc6 100644 --- a/src/cryfs/config/CryCipher.cpp +++ b/src/cryfs/impl/config/CryCipher.cpp @@ -2,7 +2,7 @@ #include #include -#include "crypto/inner/ConcreteInnerEncryptor.h" +#include "cryfs/impl/config/crypto/inner/ConcreteInnerEncryptor.h" using std::vector; using std::string; diff --git a/src/cryfs/config/CryCipher.h b/src/cryfs/impl/config/CryCipher.h similarity index 96% rename from src/cryfs/config/CryCipher.h rename to src/cryfs/impl/config/CryCipher.h index 14de19d0..6e034d74 100644 --- a/src/cryfs/config/CryCipher.h +++ b/src/cryfs/impl/config/CryCipher.h @@ -7,7 +7,7 @@ #include #include #include -#include "crypto/inner/InnerEncryptor.h" +#include "cryfs/impl/config/crypto/inner/InnerEncryptor.h" #include namespace cryfs { diff --git a/src/cryfs/config/CryConfig.cpp b/src/cryfs/impl/config/CryConfig.cpp similarity index 100% rename from src/cryfs/config/CryConfig.cpp rename to src/cryfs/impl/config/CryConfig.cpp diff --git a/src/cryfs/config/CryConfig.h b/src/cryfs/impl/config/CryConfig.h similarity index 100% rename from src/cryfs/config/CryConfig.h rename to src/cryfs/impl/config/CryConfig.h diff --git a/src/cryfs/config/CryConfigConsole.cpp b/src/cryfs/impl/config/CryConfigConsole.cpp similarity index 100% rename from src/cryfs/config/CryConfigConsole.cpp rename to src/cryfs/impl/config/CryConfigConsole.cpp diff --git a/src/cryfs/config/CryConfigConsole.h b/src/cryfs/impl/config/CryConfigConsole.h similarity index 100% rename from src/cryfs/config/CryConfigConsole.h rename to src/cryfs/impl/config/CryConfigConsole.h diff --git a/src/cryfs/config/CryConfigCreator.cpp b/src/cryfs/impl/config/CryConfigCreator.cpp similarity index 97% rename from src/cryfs/config/CryConfigCreator.cpp rename to src/cryfs/impl/config/CryConfigCreator.cpp index 129c1cee..2bd72996 100644 --- a/src/cryfs/config/CryConfigCreator.cpp +++ b/src/cryfs/impl/config/CryConfigCreator.cpp @@ -2,8 +2,8 @@ #include "CryCipher.h" #include #include -#include -#include +#include +#include using cpputils::Console; using cpputils::RandomGenerator; diff --git a/src/cryfs/config/CryConfigCreator.h b/src/cryfs/impl/config/CryConfigCreator.h similarity index 97% rename from src/cryfs/config/CryConfigCreator.h rename to src/cryfs/impl/config/CryConfigCreator.h index df3f0496..aa74b37d 100644 --- a/src/cryfs/config/CryConfigCreator.h +++ b/src/cryfs/impl/config/CryConfigCreator.h @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include "CryConfig.h" #include "CryConfigConsole.h" diff --git a/src/cryfs/config/CryConfigFile.cpp b/src/cryfs/impl/config/CryConfigFile.cpp similarity index 100% rename from src/cryfs/config/CryConfigFile.cpp rename to src/cryfs/impl/config/CryConfigFile.cpp diff --git a/src/cryfs/config/CryConfigFile.h b/src/cryfs/impl/config/CryConfigFile.h similarity index 94% rename from src/cryfs/config/CryConfigFile.h rename to src/cryfs/impl/config/CryConfigFile.h index 9d34cb8e..a9fd2ed9 100644 --- a/src/cryfs/config/CryConfigFile.h +++ b/src/cryfs/impl/config/CryConfigFile.h @@ -7,7 +7,7 @@ #include "CryConfig.h" #include #include -#include "crypto/CryConfigEncryptorFactory.h" +#include "cryfs/impl/config/crypto/CryConfigEncryptorFactory.h" namespace cryfs { class CryConfigFile final { diff --git a/src/cryfs/config/CryConfigLoader.cpp b/src/cryfs/impl/config/CryConfigLoader.cpp similarity index 98% rename from src/cryfs/config/CryConfigLoader.cpp rename to src/cryfs/impl/config/CryConfigLoader.cpp index 79d1f238..5cd8b80d 100644 --- a/src/cryfs/config/CryConfigLoader.cpp +++ b/src/cryfs/impl/config/CryConfigLoader.cpp @@ -6,9 +6,9 @@ #include #include #include -#include "cryfs/localstate/LocalStateDir.h" -#include "cryfs/localstate/LocalStateMetadata.h" -#include "cryfs/CryfsException.h" +#include "cryfs/impl/localstate/LocalStateDir.h" +#include "cryfs/impl/localstate/LocalStateMetadata.h" +#include "cryfs/impl/CryfsException.h" namespace bf = boost::filesystem; using cpputils::Console; diff --git a/src/cryfs/config/CryConfigLoader.h b/src/cryfs/impl/config/CryConfigLoader.h similarity index 100% rename from src/cryfs/config/CryConfigLoader.h rename to src/cryfs/impl/config/CryConfigLoader.h diff --git a/src/cryfs/config/CryKeyProvider.cpp b/src/cryfs/impl/config/CryKeyProvider.cpp similarity index 100% rename from src/cryfs/config/CryKeyProvider.cpp rename to src/cryfs/impl/config/CryKeyProvider.cpp diff --git a/src/cryfs/config/CryKeyProvider.h b/src/cryfs/impl/config/CryKeyProvider.h similarity index 100% rename from src/cryfs/config/CryKeyProvider.h rename to src/cryfs/impl/config/CryKeyProvider.h diff --git a/src/cryfs/config/CryPasswordBasedKeyProvider.cpp b/src/cryfs/impl/config/CryPasswordBasedKeyProvider.cpp similarity index 100% rename from src/cryfs/config/CryPasswordBasedKeyProvider.cpp rename to src/cryfs/impl/config/CryPasswordBasedKeyProvider.cpp diff --git a/src/cryfs/config/CryPasswordBasedKeyProvider.h b/src/cryfs/impl/config/CryPasswordBasedKeyProvider.h similarity index 100% rename from src/cryfs/config/CryPasswordBasedKeyProvider.h rename to src/cryfs/impl/config/CryPasswordBasedKeyProvider.h diff --git a/src/cryfs/config/CryPresetPasswordBasedKeyProvider.cpp b/src/cryfs/impl/config/CryPresetPasswordBasedKeyProvider.cpp similarity index 100% rename from src/cryfs/config/CryPresetPasswordBasedKeyProvider.cpp rename to src/cryfs/impl/config/CryPresetPasswordBasedKeyProvider.cpp diff --git a/src/cryfs/config/CryPresetPasswordBasedKeyProvider.h b/src/cryfs/impl/config/CryPresetPasswordBasedKeyProvider.h similarity index 100% rename from src/cryfs/config/CryPresetPasswordBasedKeyProvider.h rename to src/cryfs/impl/config/CryPresetPasswordBasedKeyProvider.h diff --git a/src/cryfs/config/crypto/CryConfigEncryptor.cpp b/src/cryfs/impl/config/crypto/CryConfigEncryptor.cpp similarity index 100% rename from src/cryfs/config/crypto/CryConfigEncryptor.cpp rename to src/cryfs/impl/config/crypto/CryConfigEncryptor.cpp diff --git a/src/cryfs/config/crypto/CryConfigEncryptor.h b/src/cryfs/impl/config/crypto/CryConfigEncryptor.h similarity index 89% rename from src/cryfs/config/crypto/CryConfigEncryptor.h rename to src/cryfs/impl/config/crypto/CryConfigEncryptor.h index fbadcff2..8d8e214c 100644 --- a/src/cryfs/config/crypto/CryConfigEncryptor.h +++ b/src/cryfs/impl/config/crypto/CryConfigEncryptor.h @@ -6,9 +6,9 @@ #include #include #include -#include "inner/InnerEncryptor.h" -#include "outer/OuterEncryptor.h" -#include "../CryCipher.h" +#include "cryfs/impl/config/crypto/inner/InnerEncryptor.h" +#include "cryfs/impl/config/crypto/outer/OuterEncryptor.h" +#include "cryfs/impl/config/CryCipher.h" namespace cryfs { //TODO Use own exception for cpputils::Serializer/cpputils::Deserializer errors and only catch them diff --git a/src/cryfs/config/crypto/CryConfigEncryptorFactory.cpp b/src/cryfs/impl/config/crypto/CryConfigEncryptorFactory.cpp similarity index 94% rename from src/cryfs/config/crypto/CryConfigEncryptorFactory.cpp rename to src/cryfs/impl/config/crypto/CryConfigEncryptorFactory.cpp index dbf63af2..26fdd0c9 100644 --- a/src/cryfs/config/crypto/CryConfigEncryptorFactory.cpp +++ b/src/cryfs/impl/config/crypto/CryConfigEncryptorFactory.cpp @@ -1,7 +1,7 @@ #include "CryConfigEncryptorFactory.h" #include -#include "outer/OuterConfig.h" -#include "cryfs/config/CryKeyProvider.h" +#include "cryfs/impl/config/crypto/outer/OuterConfig.h" +#include "cryfs/impl/config/CryKeyProvider.h" using namespace cpputils::logging; using boost::optional; diff --git a/src/cryfs/config/crypto/CryConfigEncryptorFactory.h b/src/cryfs/impl/config/crypto/CryConfigEncryptorFactory.h similarity index 87% rename from src/cryfs/config/crypto/CryConfigEncryptorFactory.h rename to src/cryfs/impl/config/crypto/CryConfigEncryptorFactory.h index fd7018d9..14d69e4f 100644 --- a/src/cryfs/config/crypto/CryConfigEncryptorFactory.h +++ b/src/cryfs/impl/config/crypto/CryConfigEncryptorFactory.h @@ -2,11 +2,11 @@ #ifndef MESSMER_CRYFS_SRC_CONFIG_CRYPTO_CRYCONFIGENCRYPTORFACTORY_H #define MESSMER_CRYFS_SRC_CONFIG_CRYPTO_CRYCONFIGENCRYPTORFACTORY_H -#include "inner/ConcreteInnerEncryptor.h" +#include "cryfs/impl/config/crypto/inner/ConcreteInnerEncryptor.h" #include "CryConfigEncryptor.h" #include #include -#include "../CryCipher.h" +#include "cryfs/impl/config/CryCipher.h" namespace cryfs { class CryKeyProvider; diff --git a/src/cryfs/config/crypto/inner/ConcreteInnerEncryptor.cpp b/src/cryfs/impl/config/crypto/inner/ConcreteInnerEncryptor.cpp similarity index 100% rename from src/cryfs/config/crypto/inner/ConcreteInnerEncryptor.cpp rename to src/cryfs/impl/config/crypto/inner/ConcreteInnerEncryptor.cpp diff --git a/src/cryfs/config/crypto/inner/ConcreteInnerEncryptor.h b/src/cryfs/impl/config/crypto/inner/ConcreteInnerEncryptor.h similarity index 100% rename from src/cryfs/config/crypto/inner/ConcreteInnerEncryptor.h rename to src/cryfs/impl/config/crypto/inner/ConcreteInnerEncryptor.h diff --git a/src/cryfs/config/crypto/inner/InnerConfig.cpp b/src/cryfs/impl/config/crypto/inner/InnerConfig.cpp similarity index 100% rename from src/cryfs/config/crypto/inner/InnerConfig.cpp rename to src/cryfs/impl/config/crypto/inner/InnerConfig.cpp diff --git a/src/cryfs/config/crypto/inner/InnerConfig.h b/src/cryfs/impl/config/crypto/inner/InnerConfig.h similarity index 100% rename from src/cryfs/config/crypto/inner/InnerConfig.h rename to src/cryfs/impl/config/crypto/inner/InnerConfig.h diff --git a/src/cryfs/config/crypto/inner/InnerEncryptor.cpp b/src/cryfs/impl/config/crypto/inner/InnerEncryptor.cpp similarity index 100% rename from src/cryfs/config/crypto/inner/InnerEncryptor.cpp rename to src/cryfs/impl/config/crypto/inner/InnerEncryptor.cpp diff --git a/src/cryfs/config/crypto/inner/InnerEncryptor.h b/src/cryfs/impl/config/crypto/inner/InnerEncryptor.h similarity index 100% rename from src/cryfs/config/crypto/inner/InnerEncryptor.h rename to src/cryfs/impl/config/crypto/inner/InnerEncryptor.h diff --git a/src/cryfs/config/crypto/outer/OuterConfig.cpp b/src/cryfs/impl/config/crypto/outer/OuterConfig.cpp similarity index 100% rename from src/cryfs/config/crypto/outer/OuterConfig.cpp rename to src/cryfs/impl/config/crypto/outer/OuterConfig.cpp diff --git a/src/cryfs/config/crypto/outer/OuterConfig.h b/src/cryfs/impl/config/crypto/outer/OuterConfig.h similarity index 100% rename from src/cryfs/config/crypto/outer/OuterConfig.h rename to src/cryfs/impl/config/crypto/outer/OuterConfig.h diff --git a/src/cryfs/config/crypto/outer/OuterEncryptor.cpp b/src/cryfs/impl/config/crypto/outer/OuterEncryptor.cpp similarity index 100% rename from src/cryfs/config/crypto/outer/OuterEncryptor.cpp rename to src/cryfs/impl/config/crypto/outer/OuterEncryptor.cpp diff --git a/src/cryfs/config/crypto/outer/OuterEncryptor.h b/src/cryfs/impl/config/crypto/outer/OuterEncryptor.h similarity index 100% rename from src/cryfs/config/crypto/outer/OuterEncryptor.h rename to src/cryfs/impl/config/crypto/outer/OuterEncryptor.h diff --git a/src/cryfs/filesystem/CryDevice.cpp b/src/cryfs/impl/filesystem/CryDevice.cpp similarity index 97% rename from src/cryfs/filesystem/CryDevice.cpp rename to src/cryfs/impl/filesystem/CryDevice.cpp index 097673b3..7b82d9b2 100644 --- a/src/cryfs/filesystem/CryDevice.cpp +++ b/src/cryfs/impl/filesystem/CryDevice.cpp @@ -1,6 +1,6 @@ #include #include -#include "cryfs/filesystem/parallelaccessfsblobstore/DirBlobRef.h" +#include "cryfs/impl/filesystem/parallelaccessfsblobstore/DirBlobRef.h" #include "CryDevice.h" #include "CryDir.h" @@ -13,14 +13,14 @@ #include #include #include -#include "cryfs/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStore.h" -#include "cryfs/filesystem/cachingfsblobstore/CachingFsBlobStore.h" -#include "cryfs/config/CryCipher.h" +#include "cryfs/impl/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStore.h" +#include "cryfs/impl/filesystem/cachingfsblobstore/CachingFsBlobStore.h" +#include "cryfs/impl/config/CryCipher.h" #include #include #include -#include "cryfs/localstate/LocalStateDir.h" -#include +#include "cryfs/impl/localstate/LocalStateDir.h" +#include using std::string; diff --git a/src/cryfs/filesystem/CryDevice.h b/src/cryfs/impl/filesystem/CryDevice.h similarity index 91% rename from src/cryfs/filesystem/CryDevice.h rename to src/cryfs/impl/filesystem/CryDevice.h index 94c59c0d..10dea0e0 100644 --- a/src/cryfs/filesystem/CryDevice.h +++ b/src/cryfs/impl/filesystem/CryDevice.h @@ -4,16 +4,16 @@ #include #include -#include "cryfs/config/CryConfigFile.h" +#include "cryfs/impl/config/CryConfigFile.h" #include #include -#include +#include -#include "cryfs/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStore.h" -#include "cryfs/filesystem/parallelaccessfsblobstore/DirBlobRef.h" -#include "cryfs/filesystem/parallelaccessfsblobstore/FileBlobRef.h" -#include "cryfs/filesystem/parallelaccessfsblobstore/SymlinkBlobRef.h" +#include "cryfs/impl/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStore.h" +#include "cryfs/impl/filesystem/parallelaccessfsblobstore/DirBlobRef.h" +#include "cryfs/impl/filesystem/parallelaccessfsblobstore/FileBlobRef.h" +#include "cryfs/impl/filesystem/parallelaccessfsblobstore/SymlinkBlobRef.h" namespace cryfs { diff --git a/src/cryfs/filesystem/CryDir.cpp b/src/cryfs/impl/filesystem/CryDir.cpp similarity index 98% rename from src/cryfs/filesystem/CryDir.cpp rename to src/cryfs/impl/filesystem/CryDir.cpp index 64b63116..7b5c017f 100644 --- a/src/cryfs/filesystem/CryDir.cpp +++ b/src/cryfs/impl/filesystem/CryDir.cpp @@ -9,7 +9,7 @@ #include "CryFile.h" #include "CryOpenFile.h" #include -#include "fsblobstore/utils/TimestampUpdateBehavior.h" +#include "cryfs/impl/filesystem/fsblobstore/utils/TimestampUpdateBehavior.h" //TODO Get rid of this in favor of exception hierarchy using fspp::fuse::FuseErrnoException; diff --git a/src/cryfs/filesystem/CryDir.h b/src/cryfs/impl/filesystem/CryDir.h similarity index 94% rename from src/cryfs/filesystem/CryDir.h rename to src/cryfs/impl/filesystem/CryDir.h index a94696f6..6424fcc1 100644 --- a/src/cryfs/filesystem/CryDir.h +++ b/src/cryfs/impl/filesystem/CryDir.h @@ -4,7 +4,7 @@ #include #include "CryNode.h" -#include "parallelaccessfsblobstore/DirBlobRef.h" +#include "cryfs/impl/filesystem/parallelaccessfsblobstore/DirBlobRef.h" namespace cryfs { diff --git a/src/cryfs/filesystem/CryFile.cpp b/src/cryfs/impl/filesystem/CryFile.cpp similarity index 100% rename from src/cryfs/filesystem/CryFile.cpp rename to src/cryfs/impl/filesystem/CryFile.cpp diff --git a/src/cryfs/filesystem/CryFile.h b/src/cryfs/impl/filesystem/CryFile.h similarity index 85% rename from src/cryfs/filesystem/CryFile.h rename to src/cryfs/impl/filesystem/CryFile.h index a2d4f557..4e66e1ca 100644 --- a/src/cryfs/filesystem/CryFile.h +++ b/src/cryfs/impl/filesystem/CryFile.h @@ -2,8 +2,8 @@ #ifndef MESSMER_CRYFS_FILESYSTEM_CRYFILE_H_ #define MESSMER_CRYFS_FILESYSTEM_CRYFILE_H_ -#include "parallelaccessfsblobstore/FileBlobRef.h" -#include "parallelaccessfsblobstore/DirBlobRef.h" +#include "cryfs/impl/filesystem/parallelaccessfsblobstore/FileBlobRef.h" +#include "cryfs/impl/filesystem/parallelaccessfsblobstore/DirBlobRef.h" #include #include "CryNode.h" diff --git a/src/cryfs/filesystem/CryNode.cpp b/src/cryfs/impl/filesystem/CryNode.cpp similarity index 100% rename from src/cryfs/filesystem/CryNode.cpp rename to src/cryfs/impl/filesystem/CryNode.cpp diff --git a/src/cryfs/filesystem/CryNode.h b/src/cryfs/impl/filesystem/CryNode.h similarity index 96% rename from src/cryfs/filesystem/CryNode.h rename to src/cryfs/impl/filesystem/CryNode.h index 9beb25f9..f433eb3e 100644 --- a/src/cryfs/filesystem/CryNode.h +++ b/src/cryfs/impl/filesystem/CryNode.h @@ -5,7 +5,7 @@ #include #include #include -#include "parallelaccessfsblobstore/DirBlobRef.h" +#include "cryfs/impl/filesystem/parallelaccessfsblobstore/DirBlobRef.h" #include "CryDevice.h" namespace cryfs { diff --git a/src/cryfs/filesystem/CryOpenFile.cpp b/src/cryfs/impl/filesystem/CryOpenFile.cpp similarity index 100% rename from src/cryfs/filesystem/CryOpenFile.cpp rename to src/cryfs/impl/filesystem/CryOpenFile.cpp diff --git a/src/cryfs/filesystem/CryOpenFile.h b/src/cryfs/impl/filesystem/CryOpenFile.h similarity index 87% rename from src/cryfs/filesystem/CryOpenFile.h rename to src/cryfs/impl/filesystem/CryOpenFile.h index 0a263a78..4ef5000b 100644 --- a/src/cryfs/filesystem/CryOpenFile.h +++ b/src/cryfs/impl/filesystem/CryOpenFile.h @@ -3,8 +3,8 @@ #define MESSMER_CRYFS_FILESYSTEM_CRYOPENFILE_H_ #include -#include "parallelaccessfsblobstore/FileBlobRef.h" -#include "parallelaccessfsblobstore/DirBlobRef.h" +#include "cryfs/impl/filesystem/parallelaccessfsblobstore/FileBlobRef.h" +#include "cryfs/impl/filesystem/parallelaccessfsblobstore/DirBlobRef.h" namespace cryfs { class CryDevice; diff --git a/src/cryfs/filesystem/CrySymlink.cpp b/src/cryfs/impl/filesystem/CrySymlink.cpp similarity index 91% rename from src/cryfs/filesystem/CrySymlink.cpp rename to src/cryfs/impl/filesystem/CrySymlink.cpp index 713f7e75..062a486e 100644 --- a/src/cryfs/filesystem/CrySymlink.cpp +++ b/src/cryfs/impl/filesystem/CrySymlink.cpp @@ -3,8 +3,8 @@ #include #include "CryDevice.h" #include "CrySymlink.h" -#include "parallelaccessfsblobstore/SymlinkBlobRef.h" -#include "fsblobstore/utils/TimestampUpdateBehavior.h" +#include "cryfs/impl/filesystem/parallelaccessfsblobstore/SymlinkBlobRef.h" +#include "cryfs/impl/filesystem/fsblobstore/utils/TimestampUpdateBehavior.h" //TODO Get rid of this in favor of exception hierarchy diff --git a/src/cryfs/filesystem/CrySymlink.h b/src/cryfs/impl/filesystem/CrySymlink.h similarity index 83% rename from src/cryfs/filesystem/CrySymlink.h rename to src/cryfs/impl/filesystem/CrySymlink.h index e9aa7ca9..ed8acea5 100644 --- a/src/cryfs/filesystem/CrySymlink.h +++ b/src/cryfs/impl/filesystem/CrySymlink.h @@ -4,8 +4,8 @@ #include #include "CryNode.h" -#include "parallelaccessfsblobstore/SymlinkBlobRef.h" -#include "parallelaccessfsblobstore/DirBlobRef.h" +#include "cryfs/impl/filesystem/parallelaccessfsblobstore/SymlinkBlobRef.h" +#include "cryfs/impl/filesystem/parallelaccessfsblobstore/DirBlobRef.h" namespace cryfs { diff --git a/src/cryfs/filesystem/cachingfsblobstore/CachingFsBlobStore.cpp b/src/cryfs/impl/filesystem/cachingfsblobstore/CachingFsBlobStore.cpp similarity index 96% rename from src/cryfs/filesystem/cachingfsblobstore/CachingFsBlobStore.cpp rename to src/cryfs/impl/filesystem/cachingfsblobstore/CachingFsBlobStore.cpp index fa3c7b17..07ef4766 100644 --- a/src/cryfs/filesystem/cachingfsblobstore/CachingFsBlobStore.cpp +++ b/src/cryfs/impl/filesystem/cachingfsblobstore/CachingFsBlobStore.cpp @@ -1,5 +1,5 @@ #include "CachingFsBlobStore.h" -#include "../fsblobstore/FsBlobStore.h" +#include "cryfs/impl/filesystem/fsblobstore/FsBlobStore.h" using cpputils::unique_ref; using cpputils::make_unique_ref; diff --git a/src/cryfs/filesystem/cachingfsblobstore/CachingFsBlobStore.h b/src/cryfs/impl/filesystem/cachingfsblobstore/CachingFsBlobStore.h similarity index 98% rename from src/cryfs/filesystem/cachingfsblobstore/CachingFsBlobStore.h rename to src/cryfs/impl/filesystem/cachingfsblobstore/CachingFsBlobStore.h index 5e75131f..a4607eb4 100644 --- a/src/cryfs/filesystem/cachingfsblobstore/CachingFsBlobStore.h +++ b/src/cryfs/impl/filesystem/cachingfsblobstore/CachingFsBlobStore.h @@ -3,7 +3,7 @@ #define MESSMER_CRYFS_FILESYSTEM_CACHINGFSBLOBSTORE_CACHINGFSBLOBSTORE_H #include -#include "../fsblobstore/FsBlobStore.h" +#include "cryfs/impl/filesystem/fsblobstore/FsBlobStore.h" #include #include "FileBlobRef.h" #include "DirBlobRef.h" diff --git a/src/cryfs/filesystem/cachingfsblobstore/DirBlobRef.cpp b/src/cryfs/impl/filesystem/cachingfsblobstore/DirBlobRef.cpp similarity index 100% rename from src/cryfs/filesystem/cachingfsblobstore/DirBlobRef.cpp rename to src/cryfs/impl/filesystem/cachingfsblobstore/DirBlobRef.cpp diff --git a/src/cryfs/filesystem/cachingfsblobstore/DirBlobRef.h b/src/cryfs/impl/filesystem/cachingfsblobstore/DirBlobRef.h similarity index 97% rename from src/cryfs/filesystem/cachingfsblobstore/DirBlobRef.h rename to src/cryfs/impl/filesystem/cachingfsblobstore/DirBlobRef.h index 16f4e586..09cc9f9d 100644 --- a/src/cryfs/filesystem/cachingfsblobstore/DirBlobRef.h +++ b/src/cryfs/impl/filesystem/cachingfsblobstore/DirBlobRef.h @@ -3,8 +3,8 @@ #define MESSMER_CRYFS_FILESYSTEM_CACHINGFSBLOBSTORE_DIRBLOBREF_H #include "FsBlobRef.h" -#include "../fsblobstore/DirBlob.h" -#include "../fsblobstore/utils/TimestampUpdateBehavior.h" +#include "cryfs/impl/filesystem/fsblobstore/DirBlob.h" +#include "cryfs/impl/filesystem/fsblobstore/utils/TimestampUpdateBehavior.h" #include namespace cryfs { diff --git a/src/cryfs/filesystem/cachingfsblobstore/FileBlobRef.cpp b/src/cryfs/impl/filesystem/cachingfsblobstore/FileBlobRef.cpp similarity index 100% rename from src/cryfs/filesystem/cachingfsblobstore/FileBlobRef.cpp rename to src/cryfs/impl/filesystem/cachingfsblobstore/FileBlobRef.cpp diff --git a/src/cryfs/filesystem/cachingfsblobstore/FileBlobRef.h b/src/cryfs/impl/filesystem/cachingfsblobstore/FileBlobRef.h similarity index 96% rename from src/cryfs/filesystem/cachingfsblobstore/FileBlobRef.h rename to src/cryfs/impl/filesystem/cachingfsblobstore/FileBlobRef.h index 07b90df3..1cd1ef64 100644 --- a/src/cryfs/filesystem/cachingfsblobstore/FileBlobRef.h +++ b/src/cryfs/impl/filesystem/cachingfsblobstore/FileBlobRef.h @@ -3,7 +3,7 @@ #define MESSMER_CRYFS_FILESYSTEM_CACHINGFSBLOBSTORE_FILEBLOBREF_H #include "FsBlobRef.h" -#include "../fsblobstore/FileBlob.h" +#include "cryfs/impl/filesystem/fsblobstore/FileBlob.h" namespace cryfs { namespace cachingfsblobstore { diff --git a/src/cryfs/filesystem/cachingfsblobstore/FsBlobRef.cpp b/src/cryfs/impl/filesystem/cachingfsblobstore/FsBlobRef.cpp similarity index 100% rename from src/cryfs/filesystem/cachingfsblobstore/FsBlobRef.cpp rename to src/cryfs/impl/filesystem/cachingfsblobstore/FsBlobRef.cpp diff --git a/src/cryfs/filesystem/cachingfsblobstore/FsBlobRef.h b/src/cryfs/impl/filesystem/cachingfsblobstore/FsBlobRef.h similarity index 95% rename from src/cryfs/filesystem/cachingfsblobstore/FsBlobRef.h rename to src/cryfs/impl/filesystem/cachingfsblobstore/FsBlobRef.h index 131dfd23..6a4ff660 100644 --- a/src/cryfs/filesystem/cachingfsblobstore/FsBlobRef.h +++ b/src/cryfs/impl/filesystem/cachingfsblobstore/FsBlobRef.h @@ -2,7 +2,7 @@ #ifndef MESSMER_CRYFS_FILESYSTEM_CACHINGFSBLOBSTORE_FSBLOBREF_H #define MESSMER_CRYFS_FILESYSTEM_CACHINGFSBLOBSTORE_FSBLOBREF_H -#include "../fsblobstore/FsBlob.h" +#include "cryfs/impl/filesystem/fsblobstore/FsBlob.h" namespace cryfs { namespace cachingfsblobstore { diff --git a/src/cryfs/filesystem/cachingfsblobstore/SymlinkBlobRef.cpp b/src/cryfs/impl/filesystem/cachingfsblobstore/SymlinkBlobRef.cpp similarity index 100% rename from src/cryfs/filesystem/cachingfsblobstore/SymlinkBlobRef.cpp rename to src/cryfs/impl/filesystem/cachingfsblobstore/SymlinkBlobRef.cpp diff --git a/src/cryfs/filesystem/cachingfsblobstore/SymlinkBlobRef.h b/src/cryfs/impl/filesystem/cachingfsblobstore/SymlinkBlobRef.h similarity index 94% rename from src/cryfs/filesystem/cachingfsblobstore/SymlinkBlobRef.h rename to src/cryfs/impl/filesystem/cachingfsblobstore/SymlinkBlobRef.h index 97fb7521..4bf1f67e 100644 --- a/src/cryfs/filesystem/cachingfsblobstore/SymlinkBlobRef.h +++ b/src/cryfs/impl/filesystem/cachingfsblobstore/SymlinkBlobRef.h @@ -3,7 +3,7 @@ #define MESSMER_CRYFS_FILESYSTEM_CACHINGFSBLOBSTORE_SYMLINKBLOBREF_H #include "FsBlobRef.h" -#include "../fsblobstore/SymlinkBlob.h" +#include "cryfs/impl/filesystem/fsblobstore/SymlinkBlob.h" namespace cryfs { namespace cachingfsblobstore { diff --git a/src/cryfs/filesystem/fsblobstore/DirBlob.cpp b/src/cryfs/impl/filesystem/fsblobstore/DirBlob.cpp similarity index 99% rename from src/cryfs/filesystem/fsblobstore/DirBlob.cpp rename to src/cryfs/impl/filesystem/fsblobstore/DirBlob.cpp index 206ede68..5ce532db 100644 --- a/src/cryfs/filesystem/fsblobstore/DirBlob.cpp +++ b/src/cryfs/impl/filesystem/fsblobstore/DirBlob.cpp @@ -6,7 +6,7 @@ #include #include -#include "../CryDevice.h" +#include "cryfs/impl/filesystem/CryDevice.h" #include "FileBlob.h" #include "SymlinkBlob.h" #include diff --git a/src/cryfs/filesystem/fsblobstore/DirBlob.h b/src/cryfs/impl/filesystem/fsblobstore/DirBlob.h similarity index 98% rename from src/cryfs/filesystem/fsblobstore/DirBlob.h rename to src/cryfs/impl/filesystem/fsblobstore/DirBlob.h index 822fb7f4..f1233882 100644 --- a/src/cryfs/filesystem/fsblobstore/DirBlob.h +++ b/src/cryfs/impl/filesystem/fsblobstore/DirBlob.h @@ -7,7 +7,7 @@ #include #include #include "FsBlob.h" -#include "utils/DirEntryList.h" +#include "cryfs/impl/filesystem/fsblobstore/utils/DirEntryList.h" #include namespace cryfs { diff --git a/src/cryfs/filesystem/fsblobstore/FileBlob.cpp b/src/cryfs/impl/filesystem/fsblobstore/FileBlob.cpp similarity index 100% rename from src/cryfs/filesystem/fsblobstore/FileBlob.cpp rename to src/cryfs/impl/filesystem/fsblobstore/FileBlob.cpp diff --git a/src/cryfs/filesystem/fsblobstore/FileBlob.h b/src/cryfs/impl/filesystem/fsblobstore/FileBlob.h similarity index 100% rename from src/cryfs/filesystem/fsblobstore/FileBlob.h rename to src/cryfs/impl/filesystem/fsblobstore/FileBlob.h diff --git a/src/cryfs/filesystem/fsblobstore/FsBlob.cpp b/src/cryfs/impl/filesystem/fsblobstore/FsBlob.cpp similarity index 100% rename from src/cryfs/filesystem/fsblobstore/FsBlob.cpp rename to src/cryfs/impl/filesystem/fsblobstore/FsBlob.cpp diff --git a/src/cryfs/filesystem/fsblobstore/FsBlob.h b/src/cryfs/impl/filesystem/fsblobstore/FsBlob.h similarity index 100% rename from src/cryfs/filesystem/fsblobstore/FsBlob.h rename to src/cryfs/impl/filesystem/fsblobstore/FsBlob.h diff --git a/src/cryfs/filesystem/fsblobstore/FsBlobStore.cpp b/src/cryfs/impl/filesystem/fsblobstore/FsBlobStore.cpp similarity index 100% rename from src/cryfs/filesystem/fsblobstore/FsBlobStore.cpp rename to src/cryfs/impl/filesystem/fsblobstore/FsBlobStore.cpp diff --git a/src/cryfs/filesystem/fsblobstore/FsBlobStore.h b/src/cryfs/impl/filesystem/fsblobstore/FsBlobStore.h similarity index 100% rename from src/cryfs/filesystem/fsblobstore/FsBlobStore.h rename to src/cryfs/impl/filesystem/fsblobstore/FsBlobStore.h diff --git a/src/cryfs/filesystem/fsblobstore/FsBlobView.cpp b/src/cryfs/impl/filesystem/fsblobstore/FsBlobView.cpp similarity index 100% rename from src/cryfs/filesystem/fsblobstore/FsBlobView.cpp rename to src/cryfs/impl/filesystem/fsblobstore/FsBlobView.cpp diff --git a/src/cryfs/filesystem/fsblobstore/FsBlobView.h b/src/cryfs/impl/filesystem/fsblobstore/FsBlobView.h similarity index 100% rename from src/cryfs/filesystem/fsblobstore/FsBlobView.h rename to src/cryfs/impl/filesystem/fsblobstore/FsBlobView.h diff --git a/src/cryfs/filesystem/fsblobstore/SymlinkBlob.cpp b/src/cryfs/impl/filesystem/fsblobstore/SymlinkBlob.cpp similarity index 100% rename from src/cryfs/filesystem/fsblobstore/SymlinkBlob.cpp rename to src/cryfs/impl/filesystem/fsblobstore/SymlinkBlob.cpp diff --git a/src/cryfs/filesystem/fsblobstore/SymlinkBlob.h b/src/cryfs/impl/filesystem/fsblobstore/SymlinkBlob.h similarity index 100% rename from src/cryfs/filesystem/fsblobstore/SymlinkBlob.h rename to src/cryfs/impl/filesystem/fsblobstore/SymlinkBlob.h diff --git a/src/cryfs/filesystem/fsblobstore/utils/DirEntry.cpp b/src/cryfs/impl/filesystem/fsblobstore/utils/DirEntry.cpp similarity index 100% rename from src/cryfs/filesystem/fsblobstore/utils/DirEntry.cpp rename to src/cryfs/impl/filesystem/fsblobstore/utils/DirEntry.cpp diff --git a/src/cryfs/filesystem/fsblobstore/utils/DirEntry.h b/src/cryfs/impl/filesystem/fsblobstore/utils/DirEntry.h similarity index 100% rename from src/cryfs/filesystem/fsblobstore/utils/DirEntry.h rename to src/cryfs/impl/filesystem/fsblobstore/utils/DirEntry.h diff --git a/src/cryfs/filesystem/fsblobstore/utils/DirEntryList.cpp b/src/cryfs/impl/filesystem/fsblobstore/utils/DirEntryList.cpp similarity index 100% rename from src/cryfs/filesystem/fsblobstore/utils/DirEntryList.cpp rename to src/cryfs/impl/filesystem/fsblobstore/utils/DirEntryList.cpp diff --git a/src/cryfs/filesystem/fsblobstore/utils/DirEntryList.h b/src/cryfs/impl/filesystem/fsblobstore/utils/DirEntryList.h similarity index 100% rename from src/cryfs/filesystem/fsblobstore/utils/DirEntryList.h rename to src/cryfs/impl/filesystem/fsblobstore/utils/DirEntryList.h diff --git a/src/cryfs/filesystem/fsblobstore/utils/TimestampUpdateBehavior.h b/src/cryfs/impl/filesystem/fsblobstore/utils/TimestampUpdateBehavior.h similarity index 100% rename from src/cryfs/filesystem/fsblobstore/utils/TimestampUpdateBehavior.h rename to src/cryfs/impl/filesystem/fsblobstore/utils/TimestampUpdateBehavior.h diff --git a/src/cryfs/filesystem/parallelaccessfsblobstore/DirBlobRef.cpp b/src/cryfs/impl/filesystem/parallelaccessfsblobstore/DirBlobRef.cpp similarity index 100% rename from src/cryfs/filesystem/parallelaccessfsblobstore/DirBlobRef.cpp rename to src/cryfs/impl/filesystem/parallelaccessfsblobstore/DirBlobRef.cpp diff --git a/src/cryfs/filesystem/parallelaccessfsblobstore/DirBlobRef.h b/src/cryfs/impl/filesystem/parallelaccessfsblobstore/DirBlobRef.h similarity index 96% rename from src/cryfs/filesystem/parallelaccessfsblobstore/DirBlobRef.h rename to src/cryfs/impl/filesystem/parallelaccessfsblobstore/DirBlobRef.h index d9f9ab98..2ee5dbaf 100644 --- a/src/cryfs/filesystem/parallelaccessfsblobstore/DirBlobRef.h +++ b/src/cryfs/impl/filesystem/parallelaccessfsblobstore/DirBlobRef.h @@ -3,8 +3,8 @@ #define MESSMER_CRYFS_FILESYSTEM_PARALLELACCESSFSBLOBSTORE_DIRBLOBREF_H #include "FsBlobRef.h" -#include "../cachingfsblobstore/DirBlobRef.h" -#include "../fsblobstore/utils/TimestampUpdateBehavior.h" +#include "cryfs/impl/filesystem/cachingfsblobstore/DirBlobRef.h" +#include "cryfs/impl/filesystem/fsblobstore/utils/TimestampUpdateBehavior.h" #include namespace cryfs { diff --git a/src/cryfs/filesystem/parallelaccessfsblobstore/FileBlobRef.cpp b/src/cryfs/impl/filesystem/parallelaccessfsblobstore/FileBlobRef.cpp similarity index 100% rename from src/cryfs/filesystem/parallelaccessfsblobstore/FileBlobRef.cpp rename to src/cryfs/impl/filesystem/parallelaccessfsblobstore/FileBlobRef.cpp diff --git a/src/cryfs/filesystem/parallelaccessfsblobstore/FileBlobRef.h b/src/cryfs/impl/filesystem/parallelaccessfsblobstore/FileBlobRef.h similarity index 95% rename from src/cryfs/filesystem/parallelaccessfsblobstore/FileBlobRef.h rename to src/cryfs/impl/filesystem/parallelaccessfsblobstore/FileBlobRef.h index 74bfb08b..68194979 100644 --- a/src/cryfs/filesystem/parallelaccessfsblobstore/FileBlobRef.h +++ b/src/cryfs/impl/filesystem/parallelaccessfsblobstore/FileBlobRef.h @@ -3,7 +3,7 @@ #define MESSMER_CRYFS_FILESYSTEM_PARALLELACCESSFSBLOBSTORE_FILEBLOBREF_H #include "FsBlobRef.h" -#include "../cachingfsblobstore/FileBlobRef.h" +#include "cryfs/impl/filesystem/cachingfsblobstore/FileBlobRef.h" namespace cryfs { namespace parallelaccessfsblobstore { diff --git a/src/cryfs/filesystem/parallelaccessfsblobstore/FsBlobRef.cpp b/src/cryfs/impl/filesystem/parallelaccessfsblobstore/FsBlobRef.cpp similarity index 100% rename from src/cryfs/filesystem/parallelaccessfsblobstore/FsBlobRef.cpp rename to src/cryfs/impl/filesystem/parallelaccessfsblobstore/FsBlobRef.cpp diff --git a/src/cryfs/filesystem/parallelaccessfsblobstore/FsBlobRef.h b/src/cryfs/impl/filesystem/parallelaccessfsblobstore/FsBlobRef.h similarity index 92% rename from src/cryfs/filesystem/parallelaccessfsblobstore/FsBlobRef.h rename to src/cryfs/impl/filesystem/parallelaccessfsblobstore/FsBlobRef.h index 68eb9363..a66ade62 100644 --- a/src/cryfs/filesystem/parallelaccessfsblobstore/FsBlobRef.h +++ b/src/cryfs/impl/filesystem/parallelaccessfsblobstore/FsBlobRef.h @@ -3,7 +3,7 @@ #define MESSMER_CRYFS_FILESYSTEM_PARALLELACCESSFSBLOBSTORE_FSBLOBREF_H #include -#include "../cachingfsblobstore/FsBlobRef.h" +#include "cryfs/impl/filesystem/cachingfsblobstore/FsBlobRef.h" namespace cryfs { namespace parallelaccessfsblobstore { diff --git a/src/cryfs/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStore.cpp b/src/cryfs/impl/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStore.cpp similarity index 98% rename from src/cryfs/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStore.cpp rename to src/cryfs/impl/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStore.cpp index 1d369512..4e8e5229 100644 --- a/src/cryfs/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStore.cpp +++ b/src/cryfs/impl/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStore.cpp @@ -1,6 +1,6 @@ #include "ParallelAccessFsBlobStore.h" #include "ParallelAccessFsBlobStoreAdapter.h" -#include "../fsblobstore/FsBlobStore.h" +#include "cryfs/impl/filesystem/fsblobstore/FsBlobStore.h" namespace bf = boost::filesystem; using cpputils::unique_ref; diff --git a/src/cryfs/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStore.h b/src/cryfs/impl/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStore.h similarity index 97% rename from src/cryfs/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStore.h rename to src/cryfs/impl/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStore.h index a57e4aed..918e7b6c 100644 --- a/src/cryfs/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStore.h +++ b/src/cryfs/impl/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStore.h @@ -6,7 +6,7 @@ #include "FileBlobRef.h" #include "DirBlobRef.h" #include "SymlinkBlobRef.h" -#include "../cachingfsblobstore/CachingFsBlobStore.h" +#include "cryfs/impl/filesystem/cachingfsblobstore/CachingFsBlobStore.h" #include "ParallelAccessFsBlobStoreAdapter.h" namespace cryfs { diff --git a/src/cryfs/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStoreAdapter.cpp b/src/cryfs/impl/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStoreAdapter.cpp similarity index 100% rename from src/cryfs/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStoreAdapter.cpp rename to src/cryfs/impl/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStoreAdapter.cpp diff --git a/src/cryfs/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStoreAdapter.h b/src/cryfs/impl/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStoreAdapter.h similarity index 94% rename from src/cryfs/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStoreAdapter.h rename to src/cryfs/impl/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStoreAdapter.h index 4a5a523b..73385043 100644 --- a/src/cryfs/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStoreAdapter.h +++ b/src/cryfs/impl/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStoreAdapter.h @@ -4,7 +4,7 @@ #include #include -#include "../cachingfsblobstore/CachingFsBlobStore.h" +#include "cryfs/impl/filesystem/cachingfsblobstore/CachingFsBlobStore.h" namespace cryfs { namespace parallelaccessfsblobstore { diff --git a/src/cryfs/filesystem/parallelaccessfsblobstore/SymlinkBlobRef.cpp b/src/cryfs/impl/filesystem/parallelaccessfsblobstore/SymlinkBlobRef.cpp similarity index 100% rename from src/cryfs/filesystem/parallelaccessfsblobstore/SymlinkBlobRef.cpp rename to src/cryfs/impl/filesystem/parallelaccessfsblobstore/SymlinkBlobRef.cpp diff --git a/src/cryfs/filesystem/parallelaccessfsblobstore/SymlinkBlobRef.h b/src/cryfs/impl/filesystem/parallelaccessfsblobstore/SymlinkBlobRef.h similarity index 93% rename from src/cryfs/filesystem/parallelaccessfsblobstore/SymlinkBlobRef.h rename to src/cryfs/impl/filesystem/parallelaccessfsblobstore/SymlinkBlobRef.h index ac2b7a26..58affcc5 100644 --- a/src/cryfs/filesystem/parallelaccessfsblobstore/SymlinkBlobRef.h +++ b/src/cryfs/impl/filesystem/parallelaccessfsblobstore/SymlinkBlobRef.h @@ -3,7 +3,7 @@ #define MESSMER_CRYFS_FILESYSTEM_PARALLELACCESSFSBLOBSTORE_SYMLINKBLOBREF_H #include "FsBlobRef.h" -#include "../cachingfsblobstore/SymlinkBlobRef.h" +#include "cryfs/impl/filesystem/cachingfsblobstore/SymlinkBlobRef.h" namespace cryfs { namespace parallelaccessfsblobstore { diff --git a/src/cryfs/localstate/BasedirMetadata.cpp b/src/cryfs/impl/localstate/BasedirMetadata.cpp similarity index 100% rename from src/cryfs/localstate/BasedirMetadata.cpp rename to src/cryfs/impl/localstate/BasedirMetadata.cpp diff --git a/src/cryfs/localstate/BasedirMetadata.h b/src/cryfs/impl/localstate/BasedirMetadata.h similarity index 100% rename from src/cryfs/localstate/BasedirMetadata.h rename to src/cryfs/impl/localstate/BasedirMetadata.h diff --git a/src/cryfs/localstate/LocalStateDir.cpp b/src/cryfs/impl/localstate/LocalStateDir.cpp similarity index 100% rename from src/cryfs/localstate/LocalStateDir.cpp rename to src/cryfs/impl/localstate/LocalStateDir.cpp diff --git a/src/cryfs/localstate/LocalStateDir.h b/src/cryfs/impl/localstate/LocalStateDir.h similarity index 100% rename from src/cryfs/localstate/LocalStateDir.h rename to src/cryfs/impl/localstate/LocalStateDir.h diff --git a/src/cryfs/localstate/LocalStateMetadata.cpp b/src/cryfs/impl/localstate/LocalStateMetadata.cpp similarity index 99% rename from src/cryfs/localstate/LocalStateMetadata.cpp rename to src/cryfs/impl/localstate/LocalStateMetadata.cpp index d87fd050..5472c7bd 100644 --- a/src/cryfs/localstate/LocalStateMetadata.cpp +++ b/src/cryfs/impl/localstate/LocalStateMetadata.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include using boost::optional; using boost::none; diff --git a/src/cryfs/localstate/LocalStateMetadata.h b/src/cryfs/impl/localstate/LocalStateMetadata.h similarity index 100% rename from src/cryfs/localstate/LocalStateMetadata.h rename to src/cryfs/impl/localstate/LocalStateMetadata.h diff --git a/src/stats/main.cpp b/src/stats/main.cpp index 7a7eecb0..5d9ad7d3 100644 --- a/src/stats/main.cpp +++ b/src/stats/main.cpp @@ -1,7 +1,7 @@ #include #include -#include -#include +#include +#include #include #include #include @@ -10,9 +10,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/test/cryfs-cli/CliTest_IntegrityCheck.cpp b/test/cryfs-cli/CliTest_IntegrityCheck.cpp index 087f1782..45bb1333 100644 --- a/test/cryfs-cli/CliTest_IntegrityCheck.cpp +++ b/test/cryfs-cli/CliTest_IntegrityCheck.cpp @@ -1,11 +1,11 @@ #include "testutils/CliTest.h" -#include -#include +#include +#include #include #include #include #include -#include +#include using std::vector; using std::string; diff --git a/test/cryfs-cli/program_options/ParserTest.cpp b/test/cryfs-cli/program_options/ParserTest.cpp index dd03d359..bcdf8be6 100644 --- a/test/cryfs-cli/program_options/ParserTest.cpp +++ b/test/cryfs-cli/program_options/ParserTest.cpp @@ -1,9 +1,9 @@ #include "testutils/ProgramOptionsTestBase.h" #include -#include +#include #include #include -#include +#include #include using namespace cryfs; diff --git a/test/cryfs-cli/testutils/CliTest.h b/test/cryfs-cli/testutils/CliTest.h index 872953a8..c933654c 100644 --- a/test/cryfs-cli/testutils/CliTest.h +++ b/test/cryfs-cli/testutils/CliTest.h @@ -17,10 +17,10 @@ #include #include #include -#include "../../cryfs/testutils/MockConsole.h" -#include "../../cryfs/testutils/TestWithFakeHomeDirectory.h" +#include "../../cryfs/impl/testutils/MockConsole.h" +#include "../../cryfs/impl/testutils/TestWithFakeHomeDirectory.h" #include -#include +#include #include #include #include diff --git a/test/cryfs/CMakeLists.txt b/test/cryfs/CMakeLists.txt index 463f13e6..d4caa9a1 100644 --- a/test/cryfs/CMakeLists.txt +++ b/test/cryfs/CMakeLists.txt @@ -1,26 +1,26 @@ project (cryfs-test) set(SOURCES - config/crypto/CryConfigEncryptorFactoryTest.cpp - config/crypto/outer/OuterConfigTest.cpp - config/crypto/outer/OuterEncryptorTest.cpp - config/crypto/inner/ConcreteInnerEncryptorTest.cpp - config/crypto/inner/InnerConfigTest.cpp - config/crypto/CryConfigEncryptorTest.cpp - config/CompatibilityTest.cpp - config/CryConfigCreatorTest.cpp - config/CryConfigFileTest.cpp - config/CryConfigTest.cpp - config/CryCipherTest.cpp - config/CryConfigLoaderTest.cpp - config/CryConfigConsoleTest.cpp - config/CryPasswordBasedKeyProviderTest.cpp - config/CryPresetPasswordBasedKeyProviderTest.cpp - filesystem/CryFsTest.cpp - filesystem/CryNodeTest.cpp - filesystem/FileSystemTest.cpp - localstate/LocalStateMetadataTest.cpp - localstate/BasedirMetadataTest.cpp + impl/config/crypto/CryConfigEncryptorFactoryTest.cpp + impl/config/crypto/outer/OuterConfigTest.cpp + impl/config/crypto/outer/OuterEncryptorTest.cpp + impl/config/crypto/inner/ConcreteInnerEncryptorTest.cpp + impl/config/crypto/inner/InnerConfigTest.cpp + impl/config/crypto/CryConfigEncryptorTest.cpp + impl/config/CompatibilityTest.cpp + impl/config/CryConfigCreatorTest.cpp + impl/config/CryConfigFileTest.cpp + impl/config/CryConfigTest.cpp + impl/config/CryCipherTest.cpp + impl/config/CryConfigLoaderTest.cpp + impl/config/CryConfigConsoleTest.cpp + impl/config/CryPasswordBasedKeyProviderTest.cpp + impl/config/CryPresetPasswordBasedKeyProviderTest.cpp + impl/filesystem/CryFsTest.cpp + impl/filesystem/CryNodeTest.cpp + impl/filesystem/FileSystemTest.cpp + impl/localstate/LocalStateMetadataTest.cpp + impl/localstate/BasedirMetadataTest.cpp ) add_executable(${PROJECT_NAME} ${SOURCES}) diff --git a/test/cryfs/config/CompatibilityTest.cpp b/test/cryfs/impl/config/CompatibilityTest.cpp similarity index 97% rename from test/cryfs/config/CompatibilityTest.cpp rename to test/cryfs/impl/config/CompatibilityTest.cpp index 2721b089..f001d998 100644 --- a/test/cryfs/config/CompatibilityTest.cpp +++ b/test/cryfs/impl/config/CompatibilityTest.cpp @@ -5,9 +5,9 @@ #include #include #include -#include -#include -#include "../testutils/MockConsole.h" +#include +#include +#include "../../impl/testutils/MockConsole.h" using cpputils::Data; using cpputils::AES256_GCM; diff --git a/test/cryfs/config/CryCipherTest.cpp b/test/cryfs/impl/config/CryCipherTest.cpp similarity index 99% rename from test/cryfs/config/CryCipherTest.cpp rename to test/cryfs/impl/config/CryCipherTest.cpp index 1fd17a43..786a72ea 100644 --- a/test/cryfs/config/CryCipherTest.cpp +++ b/test/cryfs/impl/config/CryCipherTest.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include #include diff --git a/test/cryfs/config/CryConfigConsoleTest.cpp b/test/cryfs/impl/config/CryConfigConsoleTest.cpp similarity index 97% rename from test/cryfs/config/CryConfigConsoleTest.cpp rename to test/cryfs/impl/config/CryConfigConsoleTest.cpp index 2be7e663..7e12d1c0 100644 --- a/test/cryfs/config/CryConfigConsoleTest.cpp +++ b/test/cryfs/impl/config/CryConfigConsoleTest.cpp @@ -1,10 +1,10 @@ #include #include -#include -#include +#include +#include #include #include -#include "../testutils/MockConsole.h" +#include "../../impl/testutils/MockConsole.h" using namespace cryfs; diff --git a/test/cryfs/config/CryConfigCreatorTest.cpp b/test/cryfs/impl/config/CryConfigCreatorTest.cpp similarity index 97% rename from test/cryfs/config/CryConfigCreatorTest.cpp rename to test/cryfs/impl/config/CryConfigCreatorTest.cpp index 3bd0ffb6..ee6b28f5 100644 --- a/test/cryfs/config/CryConfigCreatorTest.cpp +++ b/test/cryfs/impl/config/CryConfigCreatorTest.cpp @@ -1,13 +1,13 @@ #include #include -#include -#include +#include +#include #include -#include "../testutils/MockConsole.h" -#include "../testutils/TestWithFakeHomeDirectory.h" +#include "../../impl/testutils/MockConsole.h" +#include "../../impl/testutils/TestWithFakeHomeDirectory.h" #include #include -#include +#include using namespace cryfs; diff --git a/test/cryfs/config/CryConfigFileTest.cpp b/test/cryfs/impl/config/CryConfigFileTest.cpp similarity index 98% rename from test/cryfs/config/CryConfigFileTest.cpp rename to test/cryfs/impl/config/CryConfigFileTest.cpp index 7640c429..4e8a549a 100644 --- a/test/cryfs/config/CryConfigFileTest.cpp +++ b/test/cryfs/impl/config/CryConfigFileTest.cpp @@ -1,8 +1,8 @@ #include -#include +#include #include #include -#include "../testutils/FakeCryKeyProvider.h" +#include "../../impl/testutils/FakeCryKeyProvider.h" using namespace cryfs; using cpputils::TempFile; diff --git a/test/cryfs/config/CryConfigLoaderTest.cpp b/test/cryfs/impl/config/CryConfigLoaderTest.cpp similarity index 98% rename from test/cryfs/config/CryConfigLoaderTest.cpp rename to test/cryfs/impl/config/CryConfigLoaderTest.cpp index ec0dcf98..4334e408 100644 --- a/test/cryfs/config/CryConfigLoaderTest.cpp +++ b/test/cryfs/impl/config/CryConfigLoaderTest.cpp @@ -1,9 +1,9 @@ #include -#include -#include -#include "../testutils/MockConsole.h" -#include "../testutils/TestWithFakeHomeDirectory.h" +#include +#include +#include "../../impl/testutils/MockConsole.h" +#include "../../impl/testutils/TestWithFakeHomeDirectory.h" #include #include #include diff --git a/test/cryfs/config/CryConfigTest.cpp b/test/cryfs/impl/config/CryConfigTest.cpp similarity index 99% rename from test/cryfs/config/CryConfigTest.cpp rename to test/cryfs/impl/config/CryConfigTest.cpp index 0bc2c09f..83ef5fc2 100644 --- a/test/cryfs/config/CryConfigTest.cpp +++ b/test/cryfs/impl/config/CryConfigTest.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include diff --git a/test/cryfs/config/CryPasswordBasedKeyProviderTest.cpp b/test/cryfs/impl/config/CryPasswordBasedKeyProviderTest.cpp similarity index 96% rename from test/cryfs/config/CryPasswordBasedKeyProviderTest.cpp rename to test/cryfs/impl/config/CryPasswordBasedKeyProviderTest.cpp index 9d6d7285..3fdde53d 100644 --- a/test/cryfs/config/CryPasswordBasedKeyProviderTest.cpp +++ b/test/cryfs/impl/config/CryPasswordBasedKeyProviderTest.cpp @@ -1,6 +1,6 @@ -#include +#include #include -#include "../testutils/MockConsole.h" +#include "../../impl/testutils/MockConsole.h" #include using cpputils::unique_ref; diff --git a/test/cryfs/config/CryPresetPasswordBasedKeyProviderTest.cpp b/test/cryfs/impl/config/CryPresetPasswordBasedKeyProviderTest.cpp similarity index 95% rename from test/cryfs/config/CryPresetPasswordBasedKeyProviderTest.cpp rename to test/cryfs/impl/config/CryPresetPasswordBasedKeyProviderTest.cpp index 56ea501a..f1875c38 100644 --- a/test/cryfs/config/CryPresetPasswordBasedKeyProviderTest.cpp +++ b/test/cryfs/impl/config/CryPresetPasswordBasedKeyProviderTest.cpp @@ -1,6 +1,6 @@ -#include +#include #include -#include "../testutils/MockConsole.h" +#include "../../impl/testutils/MockConsole.h" #include using cpputils::make_unique_ref; diff --git a/test/cryfs/config/crypto/CryConfigEncryptorFactoryTest.cpp b/test/cryfs/impl/config/crypto/CryConfigEncryptorFactoryTest.cpp similarity index 95% rename from test/cryfs/config/crypto/CryConfigEncryptorFactoryTest.cpp rename to test/cryfs/impl/config/crypto/CryConfigEncryptorFactoryTest.cpp index 3d654651..661a3028 100644 --- a/test/cryfs/config/crypto/CryConfigEncryptorFactoryTest.cpp +++ b/test/cryfs/impl/config/crypto/CryConfigEncryptorFactoryTest.cpp @@ -1,8 +1,8 @@ #include -#include +#include #include #include -#include "../../testutils/FakeCryKeyProvider.h" +#include "../../../impl/testutils/FakeCryKeyProvider.h" using cpputils::AES256_GCM; using cpputils::Data; diff --git a/test/cryfs/config/crypto/CryConfigEncryptorTest.cpp b/test/cryfs/impl/config/crypto/CryConfigEncryptorTest.cpp similarity index 98% rename from test/cryfs/config/crypto/CryConfigEncryptorTest.cpp rename to test/cryfs/impl/config/crypto/CryConfigEncryptorTest.cpp index ac8bc76b..d657ed36 100644 --- a/test/cryfs/config/crypto/CryConfigEncryptorTest.cpp +++ b/test/cryfs/impl/config/crypto/CryConfigEncryptorTest.cpp @@ -1,7 +1,7 @@ #include #include #include -#include +#include using std::ostream; using cpputils::unique_ref; diff --git a/test/cryfs/config/crypto/inner/ConcreteInnerEncryptorTest.cpp b/test/cryfs/impl/config/crypto/inner/ConcreteInnerEncryptorTest.cpp similarity index 98% rename from test/cryfs/config/crypto/inner/ConcreteInnerEncryptorTest.cpp rename to test/cryfs/impl/config/crypto/inner/ConcreteInnerEncryptorTest.cpp index 37008f4e..6157e790 100644 --- a/test/cryfs/config/crypto/inner/ConcreteInnerEncryptorTest.cpp +++ b/test/cryfs/impl/config/crypto/inner/ConcreteInnerEncryptorTest.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include diff --git a/test/cryfs/config/crypto/inner/InnerConfigTest.cpp b/test/cryfs/impl/config/crypto/inner/InnerConfigTest.cpp similarity index 97% rename from test/cryfs/config/crypto/inner/InnerConfigTest.cpp rename to test/cryfs/impl/config/crypto/inner/InnerConfigTest.cpp index 4390051f..3f1ebcac 100644 --- a/test/cryfs/config/crypto/inner/InnerConfigTest.cpp +++ b/test/cryfs/impl/config/crypto/inner/InnerConfigTest.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include using cpputils::Data; using cpputils::DataFixture; diff --git a/test/cryfs/config/crypto/outer/OuterConfigTest.cpp b/test/cryfs/impl/config/crypto/outer/OuterConfigTest.cpp similarity index 97% rename from test/cryfs/config/crypto/outer/OuterConfigTest.cpp rename to test/cryfs/impl/config/crypto/outer/OuterConfigTest.cpp index f7f7fb0a..ba2068b0 100644 --- a/test/cryfs/config/crypto/outer/OuterConfigTest.cpp +++ b/test/cryfs/impl/config/crypto/outer/OuterConfigTest.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include using cpputils::Data; using cpputils::DataFixture; diff --git a/test/cryfs/config/crypto/outer/OuterEncryptorTest.cpp b/test/cryfs/impl/config/crypto/outer/OuterEncryptorTest.cpp similarity index 97% rename from test/cryfs/config/crypto/outer/OuterEncryptorTest.cpp rename to test/cryfs/impl/config/crypto/outer/OuterEncryptorTest.cpp index e28cf16c..412fc726 100644 --- a/test/cryfs/config/crypto/outer/OuterEncryptorTest.cpp +++ b/test/cryfs/impl/config/crypto/outer/OuterEncryptorTest.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include diff --git a/test/cryfs/filesystem/CryFsTest.cpp b/test/cryfs/impl/filesystem/CryFsTest.cpp similarity index 90% rename from test/cryfs/filesystem/CryFsTest.cpp rename to test/cryfs/impl/filesystem/CryFsTest.cpp index a432948d..cd92e79f 100644 --- a/test/cryfs/filesystem/CryFsTest.cpp +++ b/test/cryfs/impl/filesystem/CryFsTest.cpp @@ -3,13 +3,13 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "../testutils/MockConsole.h" -#include -#include +#include +#include #include #include "../testutils/TestWithFakeHomeDirectory.h" #include diff --git a/test/cryfs/filesystem/CryNodeTest.cpp b/test/cryfs/impl/filesystem/CryNodeTest.cpp similarity index 96% rename from test/cryfs/filesystem/CryNodeTest.cpp rename to test/cryfs/impl/filesystem/CryNodeTest.cpp index 4fc87515..7b4b1bc6 100644 --- a/test/cryfs/filesystem/CryNodeTest.cpp +++ b/test/cryfs/impl/filesystem/CryNodeTest.cpp @@ -1,8 +1,8 @@ #include #include "testutils/CryTestBase.h" -#include -#include -#include +#include +#include +#include using cpputils::unique_ref; using cpputils::dynamic_pointer_move; diff --git a/test/cryfs/filesystem/FileSystemTest.cpp b/test/cryfs/impl/filesystem/FileSystemTest.cpp similarity index 92% rename from test/cryfs/filesystem/FileSystemTest.cpp rename to test/cryfs/impl/filesystem/FileSystemTest.cpp index 22193195..ab1e286b 100644 --- a/test/cryfs/filesystem/FileSystemTest.cpp +++ b/test/cryfs/impl/filesystem/FileSystemTest.cpp @@ -2,9 +2,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include "../testutils/MockConsole.h" #include "../testutils/TestWithFakeHomeDirectory.h" diff --git a/test/cryfs/filesystem/testutils/CryTestBase.h b/test/cryfs/impl/filesystem/testutils/CryTestBase.h similarity index 94% rename from test/cryfs/filesystem/testutils/CryTestBase.h rename to test/cryfs/impl/filesystem/testutils/CryTestBase.h index 380b6960..aac26005 100644 --- a/test/cryfs/filesystem/testutils/CryTestBase.h +++ b/test/cryfs/impl/filesystem/testutils/CryTestBase.h @@ -1,8 +1,8 @@ #ifndef MESSMER_CRYFS_TEST_CRYFS_FILESYSTEM_CRYTESTBASE_H #define MESSMER_CRYFS_TEST_CRYFS_FILESYSTEM_CRYTESTBASE_H -#include -#include +#include +#include #include #include #include diff --git a/test/cryfs/localstate/BasedirMetadataTest.cpp b/test/cryfs/impl/localstate/BasedirMetadataTest.cpp similarity index 95% rename from test/cryfs/localstate/BasedirMetadataTest.cpp rename to test/cryfs/impl/localstate/BasedirMetadataTest.cpp index 10e21f5d..f79cb2b1 100644 --- a/test/cryfs/localstate/BasedirMetadataTest.cpp +++ b/test/cryfs/impl/localstate/BasedirMetadataTest.cpp @@ -1,8 +1,8 @@ #include -#include -#include -#include +#include +#include +#include #include #include "../testutils/TestWithFakeHomeDirectory.h" diff --git a/test/cryfs/localstate/LocalStateMetadataTest.cpp b/test/cryfs/impl/localstate/LocalStateMetadataTest.cpp similarity index 97% rename from test/cryfs/localstate/LocalStateMetadataTest.cpp rename to test/cryfs/impl/localstate/LocalStateMetadataTest.cpp index c55f8163..c32aa700 100644 --- a/test/cryfs/localstate/LocalStateMetadataTest.cpp +++ b/test/cryfs/impl/localstate/LocalStateMetadataTest.cpp @@ -1,6 +1,6 @@ #include -#include +#include #include #include #include diff --git a/test/cryfs/testutils/FakeCryKeyProvider.h b/test/cryfs/impl/testutils/FakeCryKeyProvider.h similarity index 96% rename from test/cryfs/testutils/FakeCryKeyProvider.h rename to test/cryfs/impl/testutils/FakeCryKeyProvider.h index 97bb8765..cda4d3cf 100644 --- a/test/cryfs/testutils/FakeCryKeyProvider.h +++ b/test/cryfs/impl/testutils/FakeCryKeyProvider.h @@ -2,7 +2,7 @@ #ifndef CRYFS_FAKECRYKEYPROVIDER_H #define CRYFS_FAKECRYKEYPROVIDER_H -#include +#include #include class FakeCryKeyProvider final : public cryfs::CryKeyProvider { diff --git a/test/cryfs/testutils/MockConsole.h b/test/cryfs/impl/testutils/MockConsole.h similarity index 100% rename from test/cryfs/testutils/MockConsole.h rename to test/cryfs/impl/testutils/MockConsole.h diff --git a/test/cryfs/testutils/MockCryKeyProvider.h b/test/cryfs/impl/testutils/MockCryKeyProvider.h similarity index 89% rename from test/cryfs/testutils/MockCryKeyProvider.h rename to test/cryfs/impl/testutils/MockCryKeyProvider.h index e9b24480..28a70f88 100644 --- a/test/cryfs/testutils/MockCryKeyProvider.h +++ b/test/cryfs/impl/testutils/MockCryKeyProvider.h @@ -2,7 +2,7 @@ #ifndef CRYFS_MOCKCRYKEYPROVIDER_H #define CRYFS_MOCKCRYKEYPROVIDER_H -#include +#include #include class MockCryKeyProvider: public cryfs::CryKeyProvider { diff --git a/test/cryfs/testutils/TestWithFakeHomeDirectory.h b/test/cryfs/impl/testutils/TestWithFakeHomeDirectory.h similarity index 100% rename from test/cryfs/testutils/TestWithFakeHomeDirectory.h rename to test/cryfs/impl/testutils/TestWithFakeHomeDirectory.h