Commit Graph

693 Commits

Author SHA1 Message Date
Sebastian Messmer
8eefb01575 Extract SignalHandler from SignalCatcher and also use it for backtrace 2019-03-17 01:08:57 -07:00
Sebastian Messmer
5596aa2a4f Merge branch 'release/0.10' into develop 2019-03-02 21:38:07 -08:00
Sebastian Messmer
6f07ebed88 Merge branch 'hotfix/idleunmount' into release/0.10 2019-02-28 22:03:29 -08:00
Sebastian Messmer
f573843f27 Fix --unmount--idle 2019-02-28 02:29:10 -08:00
Sebastian Messmer
d26f1faca6 Fix thread name test, make sure it can't pass when it's getting the name of the wrong thread 2019-02-28 01:21:36 -08:00
Sebastian Messmer
811584d800 Merge branch 'release/0.10' into develop 2019-02-15 22:38:29 -10:00
Sebastian Messmer
a8aeec2f75 Fix test cases 2019-02-15 22:27:15 -10:00
Sebastian Messmer
6142485859 Merge LeftRight fixes from develop 2019-02-02 13:03:14 -08:00
Sebastian Messmer
95203356cb Fix destructor race in LeftRight and add additional test cases 2019-02-02 13:00:53 -08:00
Sebastian Messmer
58fd7c3956 Merge from release/0.10 2019-01-27 05:38:17 -08:00
Sebastian Messmer
67e9885d10 Implement cpputils::ProgressBar 2019-01-26 11:19:25 -08:00
Sebastian Messmer
8a5091b8a2 Add Blob::numNodes() 2019-01-26 11:19:25 -08:00
Sebastian Messmer
5386f5b0c9 Implement SignalCatcher 2019-01-26 11:19:25 -08:00
Sebastian Messmer
97e0a7e031 Implement LeftRight 2019-01-26 11:19:21 -08:00
Sebastian Messmer
b2f9e5cc60 Move cryfs code into impl/ subfolder 2019-01-25 23:47:17 -08:00
Sebastian Messmer
48dea1b13b Merge branch 'develop' into feature/library_intermediate2 2019-01-24 13:15:57 -08:00
Sebastian Messmer
6fff8c8030 Merge branch 'develop' into feature/library_intermediate 2019-01-24 13:13:44 -08:00
Sebastian Messmer
86ef1012ac Merge branch 'develop' into feature/remove_cryptopp_compat 2019-01-24 00:43:53 -08:00
Sebastian Messmer
a3c1512634 Merge branch 'release/0.10' into develop 2019-01-24 00:43:39 -08:00
Sebastian Messmer
1eba529a47 Merge branch 'release/0.10' into feature/library_intermediate 2019-01-24 00:43:21 -08:00
Sebastian Messmer
ff19a9e128 Release appveyor builds are actually release builds 2019-01-23 16:45:30 -08:00
Sebastian Messmer
71cfefb6cf Merge branch 'feature/library_intermediate' into feature/library_intermediate2 2019-01-21 23:41:56 -08:00
Sebastian Messmer
227058a87a Merge branch 'develop' into feature/library_intermediate 2019-01-21 23:41:09 -08:00
Sebastian Messmer
a34095ffde Merge branch 'release/0.10' into develop 2019-01-21 00:12:17 -08:00
Sebastian Messmer
db6ed6ec99 Use more deterring language in question if file system should be migrated 2019-01-21 00:12:07 -08:00
Sebastian Messmer
136716e65f merge 2019-01-20 20:23:49 -08:00
Sebastian Messmer
b526c3fd89 Merge branch 'develop' into feature/library_intermediate 2019-01-20 20:21:54 -08:00
Sebastian Messmer
ee8be26c83 Merge branch 'release/0.10' into develop 2019-01-20 20:20:54 -08:00
Sebastian Messmer
4f70437715 Remove legacy code making CryFS compatible with older Crypto++ versions. We need a newer Crypto++ versions now anyhow because we use its scrypt implementation. 2019-01-20 14:07:06 -08:00
Sebastian Messmer
8d09fb4c46 Set meaningful thread names for debugging purposes 2019-01-20 13:15:15 -08:00
Sebastian Messmer
29f7f06ca9 Implement set_thread_name and get_thread_name for debugging purposes 2019-01-20 13:15:11 -08:00
Sebastian Messmer
d9eee20ab8 Merge branch 'release/0.10' into develop 2019-01-20 02:29:01 -08:00
Sebastian Messmer
f6c6128f82 Fix test 2019-01-20 02:28:46 -08:00
Sebastian Messmer
5793be09bb Merge branch 'release/0.10' into develop 2019-01-19 13:03:22 -08:00
Sebastian Messmer
58cb91102d Implement cryfs-unmount for unmounting filesystems 2019-01-19 13:02:41 -08:00
Sebastian Messmer
d86fcf27c6 Merge branch 'release/0.10' into develop 2019-01-12 23:21:40 -08:00
Sebastian Messmer
1da3e6cbae - Fix for reading empty files out of bounds
- Fixed race condition (https://github.com/cryfs/cryfs/issues/224 and https://github.com/cryfs/cryfs/issues/243)
2019-01-12 23:21:12 -08:00
Sebastian Messmer
d259361ad8 Fix either_test to use optional more directly 2018-12-26 08:23:00 +01:00
Sebastian Messmer
a8476a2699 Implement either<A, B> type 2018-12-26 08:19:01 +01:00
Sebastian Messmer
d8841d4f06 Merge branch 'feature/library_intermediate' into feature/library_intermediate2 2018-12-25 19:54:49 +01:00
Sebastian Messmer
6177079d6a Merge branch 'feature/either3' into feature/library_intermediate 2018-12-25 19:54:36 +01:00
Sebastian Messmer
1fdfdb3437 Change either_test to use optional correctly 2018-12-25 19:53:47 +01:00
Sebastian Messmer
e489ce9880 Fix for travis 2018-12-25 19:53:33 +01:00
Sebastian Messmer
a86ac8241d fix clang-tidy 2018-12-25 19:50:53 +01:00
Sebastian Messmer
70a25d2cb0 try fix 2018-12-25 07:45:10 +01:00
Sebastian Messmer
9aa0dbfc19 try fix 2018-12-25 07:43:41 +01:00
Sebastian Messmer
7df156b74a try fix 2018-12-24 20:02:40 +01:00
Sebastian Messmer
d8691d282b Defer daemonization to Fuse, introduce Fuse::runInBackground() / Fuse::runInForeground() 2018-12-24 19:03:38 +01:00
Sebastian Messmer
57fc1f1cb8 Merge branch 'feature/either2' into feature/library_intermediate 2018-12-24 18:35:52 +01:00
Sebastian Messmer
59d6a10d28 Fix and add test cases 2018-12-24 18:15:08 +01:00