Commit Graph

2036 Commits

Author SHA1 Message Date
Sebastian Messmer
5299be5dda Wire through the missingBlockIsIntegrityViolation setting 2017-09-16 16:49:33 +01:00
Sebastian Messmer
b6ce7c3ae4 Allow disabling integrity checks on command line 2017-09-16 16:18:53 +01:00
Sebastian Messmer
ab0a83917f Only run compatibility unit tests in compatibility mode 2017-09-16 01:23:40 +01:00
Sebastian Messmer
666d24e7b8 Fix no-compatibility mode 2017-09-16 00:52:23 +01:00
Sebastian Messmer
2151d6f453 Add a CI test for non-compatibility mode 2017-09-16 00:42:03 +01:00
Sebastian Messmer
e55706bb25 Add a CI test for non-compatibility mode 2017-09-16 00:40:24 +01:00
Sebastian Messmer
f6b6875bb2 Rename VersionCountingBlockStore -> IntegrityBlockStore 2017-09-16 00:18:58 +01:00
Sebastian Messmer
00d098952b Storing block ID is job of VersionCountingBlockStore, not EncryptedBlockStore. 2017-09-16 00:09:15 +01:00
Sebastian Messmer
3d52f6a8c4 Merge branch 'circleci-develop' into develop 2017-09-12 22:27:53 +01:00
Sebastian Messmer
82587ca185 Workaround bug in gcc 6/7 for building unit tests 2017-09-12 22:12:01 +01:00
Sebastian Messmer
a5dbb1ce0b Add circleci (taken from next branch) 2017-09-12 21:46:45 +01:00
Sebastian Messmer
446e6e2654 CI: reupload apt-cache when packages changed 2017-09-12 21:43:26 +01:00
Sebastian Messmer
19c5874d7a Speed up CI by using caches 2017-09-12 21:36:18 +01:00
Sebastian Messmer
0af7dea095 Fix tests on osx 2017-09-12 00:58:33 +01:00
Sebastian Messmer
26637acc34 Add more compiler versions to Circle CI 2017-09-12 00:57:05 +01:00
Sebastian Messmer
52bfa634b5 Update CI link to Circle CI 2017-09-11 22:59:21 +01:00
Sebastian Messmer
deb47ada11 Add clang build to Circle CI 2017-09-11 22:40:41 +01:00
Sebastian Messmer
29cb24b762 Remove run_with_fuse.sh from CI 2017-09-11 15:25:56 +01:00
Sebastian Messmer
f6d447658b Add Circle CI config 2017-09-11 14:38:08 +01:00
Sebastian Messmer
0ec081750e Fix test cases 2017-09-11 14:37:06 +01:00
Sebastian Messmer
9516d4facc Further compatibility fixes for GCC 4.8 2017-09-10 14:27:14 +01:00
Sebastian Messmer
5269734003 Re-establish compatibility with GCC 4.8 2017-09-10 13:35:07 +01:00
Sebastian Messmer
a584cddb86 Merge branch 'next' of github.com:cryfs/cryfs into next 2017-09-09 14:45:30 +01:00
Sebastian Messmer
fe1383b4ff Fix build 2017-09-09 14:44:01 +01:00
Sebastian Messmer
51e9ac39d2 GCC bug workaround 2017-09-09 14:40:34 +01:00
Christoph Gysin
d963424630 fix pessimizing move warnings (#170)
This fixes warnings emitted by clang:

src/cpp-utils/data/Data.cpp:37:10:
warning: moving a local object in a return statement prevents copy elision [-Wpessimizing-move]
        return std::move(result);
               ^
src/blockstore/implementations/ondisk/OnDiskBlockStore.cpp:61:17:
warning: moving a temporary object prevents copy elision [-Wpessimizing-move]
        auto result = std::move(OnDiskBlock::CreateOnDisk(_rootdir, key, std::move(data)));
                      ^
src/blobstore/implementations/onblocks/datatreestore/DataTree.cpp:249:10:
warning: moving a local object in a return statement prevents copy elision [-Wpessimizing-move]
        return std::move(chain);
               ^

See also:
http://vmpstr.blogspot.ch/2015/12/redundant-stdmove.html
2017-09-06 17:26:27 +01:00
Mouse
977a381740 Fix compatibility with Crypto++ 6.0 (#169)
* Fix compatibility with Crypto++ 6.0 in a newly-introduced file EncryptedBlockStore2.h

* Convert fix to how it was done in "develop" branch
2017-09-05 21:51:24 +01:00
Sebastian Messmer
7e56c46bb0 CryFS tells the operating system to not swap the encryption key to the disk (note: this is best-effort and cannot be guaranteed. Hibernation, for example, will still write the encryption key to the disk) 2017-09-05 00:43:43 +01:00
Sebastian Messmer
06e8fc15d4 Fix test case build 2017-09-05 00:38:24 +01:00
Jari Karppinen
bdc7d27998 Update CMakeLists.txt (#168)
* Update CMakeLists.txt

This just reuses the default package description for RPM package as well (one would expect this to be the default, but doesn't seem to be the case with cmake 3.9.1 at least).

* Update CMakeLists.txt

This prevents cryfs RPM for owning filesystem directories which was causing installation error.

* Update README.md

Same instructions apply for building .rpm package.
2017-09-02 10:04:20 +01:00
Sebastian Messmer
fb2d903379 Merge branch 'next' of github.com:cryfs/cryfs into next 2017-08-31 23:59:05 +01:00
Sebastian Messmer
8a92936765 Re-allow usage of boost 1.56 since we don't use boost::futures anymore 2017-08-31 23:58:57 +01:00
Sebastian Meßmer
3d1bf9e2b9 Update ChangeLog 2017-08-31 23:48:22 +01:00
Sebastian Messmer
3aa8b74fd9 Fix fsstat on osx 2017-08-31 23:40:25 +01:00
Sebastian Messmer
bc46bc88e9 Fix some issues with fspp-test on Mac OS X 2017-08-25 00:14:16 +01:00
Sebastian Messmer
f951f41877 Fix cryfs-cli-test on Mac OS X 2017-08-24 23:43:35 +01:00
Sebastian Messmer
4da81fdbef Fix build on Mac OS X 2017-08-24 21:28:59 +01:00
Sebastian Messmer
fc21b0882a Fix relatime performance 2017-08-24 08:19:16 +01:00
Sebastian Messmer
0c3f16d0ce ChangeLog 2017-08-23 20:33:10 +01:00
Sebastian Messmer
5fb4098c8b Implement relatime behavior for performance 2017-08-23 20:32:36 +01:00
Sebastian Messmer
679b14a4d8 * Allow mounting using system mount tool and /etc/fstab (e.g. mount -t fuse.cryfs basedir mountdir)
* Pass fuse options directly to cryfs (i.e. 'cryfs basedir mountdir -o allow_other' instead of 'cryfs basedir mountdir -- -o allow_other')
2017-08-23 09:56:03 +01:00
Sebastian Messmer
ffc0b5195c - Fix CachingBlockStore2_Specific test cases to actually test CachingBlockStore2
- Remove old CachingBlockStore
2017-08-22 00:03:04 +01:00
Sebastian Messmer
30cec27bd8 Improve remove handling in cache 2017-08-21 23:43:11 +01:00
Sebastian Messmer
9d298bad6c Switch to new caching block store 2017-08-21 23:11:45 +01:00
Sebastian Messmer
509bf6cc26 Fix CachingBlockStore2 and add test case for it 2017-08-21 23:09:43 +01:00
Sebastian Messmer
4add7f3d80 Start implementing new cache 2017-08-21 22:44:35 +01:00
Sebastian Messmer
a45c0bf29a Fix merge conflict 2017-08-20 01:12:28 +01:00
Sebastian Messmer
ff34049787 Merge branch 'next' into newblockstore 2017-08-19 11:54:01 +01:00
Sebastian Messmer
ade23f9b86 Merge branch 'develop' into next 2017-08-19 11:53:22 +01:00
Mouse
7abed14d63 Make compatible with the current Crypto++ master (#163)
* Make compatible with the current Crypto++ master

* Add auto-config and build script. Not important, just a time-saver.

* Address compatibility with Crypto++ 6.0 release, while maintaining compatibility
with the older Crypto++ releases.

* Polish comments in cryptopp_byte.h. Forgot to include it to RandomGeneratorThread - fixed.

* Late at night - forgot to fix the .cpp files that used ::byte...

* Renamed auto-config-and-run script

* Added comments/description, and commented out "make check" that fails anyway

* Changed the include guard to match the rest of the .h files

* Delete build script

* Update ChangeLog.txt

* Update ChangeLog.txt
2017-08-16 03:00:46 +01:00