Commit Graph

1888 Commits

Author SHA1 Message Date
Sebastian Messmer
b027f8c007 Merge from develop 2016-09-24 20:43:54 +02:00
Sebastian Messmer
5b1c2aeb87 Merge branch 'develop' of github.com:cryfs/cryfs into develop 2016-09-24 20:29:15 +02:00
Sebastian Messmer
1e9fdc9aa7 Refactor noninteractive mode. All yes/no questions are forced to define a default that will be used in noninteractive mode. 2016-09-24 20:28:56 +02:00
Sebastian Meßmer
6a4f5a167b Update ChangeLog.txt 2016-09-24 19:48:01 +02:00
Sebastian Meßmer
d00151af37 Disable Mars448 test cases when Mars448 is not available and fix Travis CI. (#92) 2016-09-24 19:09:30 +02:00
Sebastian Messmer
378e259eee Fix assert_release_test 2016-09-24 17:05:45 +02:00
Sebastian Messmer
1cf52b307d Fix locking in LockPool 2016-09-24 17:02:23 +02:00
Sebastian Messmer
11a85ed29f Allow building with -DCRYFS_UPDATE_CHECKS=off, which will create an executable with disabled update checks (the alternative to disable them in the environment also still works). 2016-09-24 13:16:26 +02:00
Sebastian Messmer
1c34c88709 Remove warning that CryFS is experimental 2016-09-24 12:33:22 +02:00
Sebastian Messmer
789bfc7527 Fix warning from static analysis tool about std::moving a large CryConfig object 2016-09-24 11:42:57 +02:00
Sebastian Messmer
116a90be6d Fix compiler warnings 2016-09-24 11:41:19 +02:00
Sebastian Messmer
46a2251e9d Fix potential (although improbable) deadlock 2016-09-24 11:01:22 +02:00
Sebastian Messmer
b4a609459b When an exception escalates to main, exit with an error code 2016-09-24 09:52:19 +02:00
Sebastian Messmer
a1c3079a68 Catch exceptions from main 2016-09-24 09:51:29 +02:00
Sebastian Messmer
dbc1b5db8c Merge branch 'develop' of github.com:cryfs/cryfs into develop 2016-09-24 09:39:48 +02:00
Sebastian Messmer
e30656797b Add compatibility with Crypto++ 5.6.4 2016-09-24 09:39:37 +02:00
Sebastian Meßmer
989c0ed571 Add a warning that cryfs is not compatible to crypto++ 5.6.4 2016-09-24 00:55:34 +02:00
Sebastian Meßmer
3f5529171b Add make as dependency 2016-09-22 20:17:05 +02:00
Sebastian Messmer
46183976ee Fix missing virtual destructor and potential integer overflow 2016-09-21 20:07:20 +02:00
Sebastian Meßmer
733622cb98 Merge pull request #87 from migueldemoura/develop
Add password leak disclaimer
2016-09-20 12:44:59 +02:00
migueldemoura
fb6633d249 Add password leak disclaimer 2016-09-19 22:48:05 +01:00
Sebastian Meßmer
e414f0a20f Switch to LGPL 2016-09-13 19:23:08 +02:00
Sebastian Messmer
32f06f288a Fix tree traversal and add test case for it 2016-09-07 22:25:18 +02:00
Sebastian Messmer
904e3dd7a1 Merge 2016-09-07 22:07:56 +02:00
Sebastian Messmer
ea349cf79b Fix traversal bug and add test case for it 2016-09-07 19:02:41 +02:00
Sebastian Meßmer
6b8179f0d0 Mention SiriKali instead of Cryfs-Gui 2016-09-01 09:59:55 +02:00
Sebastian Meßmer
a9360acc5b Update ChangeLog.txt 2016-09-01 00:31:53 +02:00
Sebastian Messmer
0cbb13ffbe Compatibility with older libcurl versions 2016-08-27 13:23:25 +02:00
Sebastian Messmer
b315154f08 Merge from develop 2016-07-23 10:17:42 +02:00
Sebastian Messmer
6360d452fe Make compatible with libcurl >= 7.50 2016-07-23 09:04:50 +02:00
Sebastian Messmer
971ed64cee Don't need run_with_fuse.sh anymore, because Travis CI kernel now has fuse support builtin. 2016-07-22 21:04:33 +02:00
Sebastian Messmer
d2cecb4ecc Disable large_read fuse option, since it's not used in new fuse versions anyhow and makes problems when fuse is run in user mode linux. 2016-07-22 20:44:06 +02:00
Sebastian Messmer
f4b1a7eced Fix assert test cases 2016-07-22 14:10:21 +02:00
Sebastian Messmer
a4ce49aef4 Fix unique_ref test cases 2016-07-22 14:07:06 +02:00
Sebastian Messmer
271cb0c42d The osx/gcc build on travis actually uses gcc 2016-07-22 13:05:59 +02:00
Sebastian Messmer
64d26c2f6e Fix compiler error on older gcc 2016-07-22 12:58:59 +02:00
Sebastian Messmer
f069733650 Fix warning on older gcc versions 2016-07-22 02:57:03 +02:00
Sebastian Messmer
0b5f90a365 By default, travis only fetches the newest 50 commits. We need more in case we're further from the last version tag, so the build doesn't fail because it can't generate the version number. 2016-07-22 02:56:15 +02:00
Sebastian Messmer
e38c0f1e8b Fix isRightBorderNode when growing trees 2016-07-17 10:32:59 +02:00
Sebastian Messmer
bbdd8a548b Special case treatment for traversals until exactly the last leaf has to load the last leaf to grow it. Before this commit, we just always loaded the last traversed leaf and checked its size. Now we only do so if it's the right border leaf. This saves us loading some leaves. 2016-07-17 10:16:09 +02:00
Sebastian Messmer
b339261924 Merge branch 'next' into lessio 2016-07-16 17:14:07 +02:00
Sebastian Messmer
f6141f515b TODOs 2016-07-16 17:08:53 +02:00
Sebastian Messmer
dc40d61595 Merge branch 'next' into lessio 2016-07-16 16:47:36 +02:00
Sebastian Messmer
e3690e2f6b Add comment 2016-07-16 16:47:27 +02:00
Sebastian Messmer
9c42703c70 Merge branch 'next' into lessio 2016-07-16 16:10:03 +02:00
Sebastian Messmer
143c3b3b4f Use large reads and large write 2016-07-16 16:09:47 +02:00
Sebastian Messmer
eab7cb1df4 Implement BlockStore::overwrite(). This is the last step in ensuring that the write() call doen't have to load leaves if they're only overwritten anyhow. 2016-07-16 11:42:06 +02:00
Sebastian Messmer
eb792daefc More preparations for not loading blocks in write() calls 2016-07-15 21:06:41 +02:00
Sebastian Messmer
d80b95514e Traversal doesn't load leaves, but returns the key. This way, the write() call can (after a future commit) write to full leaves without loading them beforehand. 2016-07-15 20:12:24 +02:00
Sebastian Messmer
582917c1f5 Improve code decreasing tree depth 2016-07-15 16:23:00 +02:00