Commit Graph

2304 Commits

Author SHA1 Message Date
Sebastian Messmer
49719e3e66 Use config file instead of dir for basedir metadata 2017-09-28 08:19:30 +01:00
Sebastian Messmer
aace4c2f13 Check that filesystem id didn't change since we loaded the basedir the last time 2017-09-28 07:41:08 +01:00
Sebastian Meßmer
0e8622d7ae Update ChangeLog.txt 2017-09-25 13:57:01 -07:00
David Steele
18788bc3f8 Patch get_total_memory() for freebsd compatibility (#172) 2017-09-25 13:55:15 -07:00
Sebastian Messmer
26b3b366c9 Use local state file instead of myClientId file 2017-09-23 20:17:05 +01:00
Sebastian Messmer
73aab31ade Make LoopThread noncopyable 2017-09-19 20:16:47 +01:00
Sebastian Messmer
222ee6acf0 Merge branch 'next' of github.com:cryfs/cryfs into next 2017-09-19 11:20:37 +01:00
Sebastian Messmer
556d9cf452 New default block size: 16KB 2017-09-19 11:20:28 +01:00
Sebastian Messmer
936d49ea50 Update to spdlog 0.14 2017-09-19 00:37:15 +01:00
Sebastian Messmer
51932e6e80 CircleCI cache depends on build type 2017-09-18 20:58:07 +01:00
Sebastian Messmer
86754d7a4e Add Debug/Release builds to CircleCI 2017-09-18 20:56:47 +01:00
Sebastian Messmer
e7cfb4a417 Disable linux build on travis because we now have Circle CI 2017-09-18 20:44:46 +01:00
Sebastian Messmer
9fdefaa4e0 Remove BlockStoreWithRandomKeys 2017-09-18 20:42:07 +01:00
Sebastian Messmer
a6592ae299 Fix clang build broken in last commit 2017-09-17 02:24:36 +01:00
Sebastian Messmer
5458af7c52 Rename blockstore::Key -> blockstore::BlockId 2017-09-17 02:07:27 +01:00
Sebastian Messmer
10e11f67e2 Make blockstore::Key more typesafe 2017-09-17 00:10:53 +01:00
Sebastian Messmer
f7c089ba47 Fix clang 5.0 compiler warnings 2017-09-16 17:45:15 +01:00
Sebastian Messmer
e4acf4e9a8 Merge from develop 2017-09-16 17:14:51 +01:00
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