Commit Graph

2622 Commits

Author SHA1 Message Date
Andy Weidenbaum
9ee345e16a Implement pthread_getname_np_gcompat for musl (#255) 2019-03-17 16:53:20 -07:00
Sebastian Messmer
8eefb01575 Extract SignalHandler from SignalCatcher and also use it for backtrace 2019-03-17 01:08:57 -07:00
Sebastian Messmer
ae680a5bdc Stop FuseThread without using signals 2019-03-16 18:09:22 -07:00
Sebastian Messmer
b738de0564 Merge branch 'release/0.10' into develop 2019-03-16 17:17:44 -07:00
Sebastian Messmer
4b771e85e6 Before, the SignalCatcherRegistry just used the std::atomic pointer to remove SignalCatcherImpls, which could get the wrong SignalCatcherImpl if a SignalCatcher registered multiple SignalCatcherImpls (since they all had the same std::atomic pointer). This wasn't an issue in practice since all SignalCatcherImpls are deregistered at the same time, so it got all of them, but it still wasn't how the code was intended to work. Now, SignalCatcherRegistry uses the SignalCatcherImpl pointer, which is the actual intention. 2019-03-12 01:30:48 -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
adf34bc6ad Merge branch 'hotfix/cryptopp81' into release/0.10 2019-02-28 22:03:03 -08:00
Sebastian Messmer
14467453a4 Merge branch 'hotfix/locale' into release/0.10 2019-02-28 22:02:31 -08:00
Sebastian Messmer
f573843f27 Fix --unmount--idle 2019-02-28 02:29:10 -08:00
Sebastian Messmer
a2442bbbe9 Update to googletest 1.8.1 2019-02-28 01:22:34 -08:00
Sebastian Messmer
8c189c9ace fix cmake crypto++ 2019-02-28 01:22:04 -08:00
Sebastian Messmer
7b742f41e3 Update to cryptopp 8.1 2019-02-28 01:22:04 -08:00
Sebastian Messmer
a09d38e182 Don't change locale on musl since it would crash 2019-02-28 01:21:49 -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
040f063629 Merge branch 'release/0.10' into develop 2019-02-10 14:29:27 -08:00
Sebastian Messmer
5a5f8f7324 When trying to migrate a file system from CryFS 0.9.3 or older, show an error message suggesting to first open it with 0.9.10 because we can't load that anymore. 2019-02-10 13:07:50 -08:00
Sebastian Messmer
34b5690b04 Merge branch 'release/0.10' into develop 2019-02-09 17:19:45 -08:00
Sebastian Messmer
97c9ac4a75 If file system migration encounters files or folders with the wrong format in the base directory, it now just ignores them instead of crashing. 2019-02-09 14:55:16 -08:00
Sebastian Messmer
f51a3aa924 Merge branch 'release/0.10' into develop 2019-02-08 18:56:16 -08:00
Sebastian Messmer
4ca139ce8f Update CI badge to master branch 2019-02-08 18:55:26 -08:00
Sebastian Messmer
a98f0f92a1 Mark 0.10.0 as released 2019-02-08 18:50:13 -08:00
Sebastian Messmer
65ee6fcc89 Merge branch 'release/0.10' into develop 2019-02-03 18:41:03 -08:00
Sebastian Messmer
88d70edbfb Remove unused command 2019-02-03 18:40:50 -08:00
Sebastian Messmer
fd63dd79f8 Merge branch 'release/0.10' into develop 2019-02-03 18:22:49 -08:00
Sebastian Messmer
2c963a321d Fix Travis CI 2019-02-03 17:15:34 -08:00
Sebastian Messmer
7138b028e8 Merge branch 'release/0.10' into develop 2019-02-02 13:03:24 -08: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 Meßmer
d3ba6d1c39
Fix merge conflict 2019-01-30 15:57:13 -08:00
Sebastian Messmer
97a264a33a Fix include path 2019-01-27 09:18:34 -08:00
Sebastian Messmer
58fd7c3956 Merge from release/0.10 2019-01-27 05:38:17 -08:00
Sebastian Messmer
1cdf530548 Merge branch 'release/0.10' of https://github.com/cryfs/cryfs into release/0.10 2019-01-27 05:24:39 -08:00
Sebastian Messmer
13ad69b3c0 Fix Windows encoding issues for non-ascii characters in filenames (https://github.com/cryfs/cryfs/issues/247) 2019-01-27 05:24:26 -08:00
Sebastian Messmer
0b9fd31dc3 Add progress bar for migrations 2019-01-26 11:19:25 -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
525c6618db Exit cryfs-stats if filesystem is wrong version 2019-01-26 11:19:25 -08:00
Sebastian Messmer
a3a9f25e02 Make integrity migration interrupt-safe 2019-01-26 11:19:25 -08:00
Sebastian Messmer
a19b2281f7 Make parent pointer migration interrupt-safe 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
652a95dd0d If a migration was interrupted, continue on next mount 2019-01-24 10:28:42 -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