Commit Graph

2486 Commits

Author SHA1 Message Date
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
Sebastian Messmer
1eba529a47 Merge branch 'release/0.10' into feature/library_intermediate 2019-01-24 00:43:21 -08:00
Sebastian Messmer
ad6125a7e4 Remove AnyCPU build from AppVeyor 2019-01-24 00:42:58 -08:00
Sebastian Messmer
5b30742769 Merge branch 'feature/library_intermediate' into feature/library_intermediate2 2019-01-23 16:47:21 -08:00
Sebastian Messmer
3ad6e4845c fix clang-tidy 2019-01-23 16:47:03 -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
d7f8a22370 Merge branch 'release/0.10' into develop 2019-01-21 23:41:00 -08:00
Sebastian Messmer
5d9192caaa Remove Visual Studio preview build from appveyor CI 2019-01-21 23:40:14 -08:00
Sebastian Messmer
3c5feec86f Merge remote-tracking branch 'origin/hotfix/win_openmp' into release/0.10 2019-01-21 23:18:21 -08:00
Sebastian Messmer
e91ebbc974 Merge branch 'release/0.10' of github.com:cryfs/cryfs into release/0.10 2019-01-21 23:18:05 -08:00
Sebastian Messmer
4c25bb3ff7 Merge branch 'feature/library_intermediate' into feature/library_intermediate2 2019-01-21 12:01:33 -08:00
Sebastian Messmer
1118e9d54d Fix clang-tidy 2019-01-21 12:01:22 -08:00
Sebastian Messmer
6042d4ba6b Build with OpenMP on Windows 2019-01-21 11:47:16 -08:00
Sebastian Meßmer
e06a0f9743
Update README.md 2019-01-21 11:25:31 -08:00
Sebastian Meßmer
fe0d5493b2
Update README.md 2019-01-21 11:24:41 -08:00
Sebastian Meßmer
081ea8d622
Update README.md
- Add installation instructions for Windows and osx
2019-01-21 11:23:52 -08:00
Sebastian Messmer
38397a2d86 Cherry-pick some commits from Crypto++ to make OpenMP for scrypt work on Windows 2019-01-21 03:38:20 -08:00
Sebastian Messmer
6251793b87 Fix typo 2019-01-21 00:29:37 -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
6801e6a3d9 Add release builds to appveyor 2019-01-20 20:20:18 -08:00
Sebastian Messmer
1d45833f90 Merge branch 'hotfix/threadname' into release/0.10 2019-01-20 20:19:54 -08:00
Sebastian Messmer
ec05613968 Mark 0.9.10 as released 2019-01-20 19:57:23 -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