Commit Graph

2690 Commits

Author SHA1 Message Date
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
0db851f73b Merge branch 'release/0.10' into develop 2019-01-19 13:44:04 -08:00
Sebastian Messmer
ad211872d5 Ask users to do backup before migrating 2019-01-19 13:43:55 -08:00
Sebastian Messmer
5ab579f60c Merge branch 'develop' of github.com:cryfs/cryfs into develop 2019-01-19 13:03:37 -08:00
Sebastian Messmer
5793be09bb Merge branch 'release/0.10' into develop 2019-01-19 13:03:22 -08:00
Sebastian Messmer
44175d8a68 Merge branch 'release/0.10' of github.com:cryfs/cryfs into release/0.10 2019-01-19 13:02:45 -08:00
Sebastian Messmer
58cb91102d Implement cryfs-unmount for unmounting filesystems 2019-01-19 13:02:41 -08:00
Sebastian Messmer
7adbe4e3ca Fix CryptoPP build on Windows 2019-01-19 13:01:43 -08:00
Sebastian Messmer
19e84a1b58 Merge branch 'release/0.10' into develop 2019-01-17 23:10:18 -08:00
Sebastian Messmer
7444f41aee Merge branch 'release/0.10' of https://github.com/cryfs/cryfs into release/0.10 2019-01-17 23:09:55 -08:00
Sebastian Messmer
8898bca76c Fix windows build 2019-01-17 23:09:47 -08:00
Sebastian Messmer
58142f1710 Merge branch 'release/0.10' into develop 2019-01-14 23:57:54 -08:00
Sebastian Messmer
30f8d02081 Windows: Allow mounting to drive letters instead of existing folders 2019-01-13 16:29:28 -08:00
Sebastian Messmer
079a43df5f Merge branch 'release/0.10' into develop 2019-01-13 09:28:20 -08:00
Sebastian Messmer
d0efbaaa72 Fix creation of relative symlinks ( https://github.com/cryfs/cryfs/issues/244 ) 2019-01-13 09:27:50 -08:00
Sebastian Messmer
af9469c907 Merge branch 'release/0.10' into develop 2019-01-12 23:27:16 -08:00
Sebastian Messmer
286bad94cc Changelog 2019-01-12 23:26:59 -08:00
Sebastian Messmer
5163368c81 Changelog 2019-01-12 23:26:38 -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
49a8c684a0 - 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:19:27 -08:00
Sebastian Messmer
1dbc425c7c Merge branch 'release/0.10' into develop 2019-01-12 16:42:25 -08:00
Sebastian Messmer
490abd5f31 Update to crypto++ 8.0. This fixes an bug where non-AESNI CPUs on Windows decrypted incorrectly 2019-01-12 16:36:23 -08:00
Sebastian Messmer
1f6af31e0e Merge branch 'feature/cryptopp8' into develop 2019-01-12 16:34:55 -08:00
Sebastian Messmer
d7ba25f556 Fix Travis CI 2019-01-12 16:31:25 -08:00
Sebastian Messmer
60aba37eaf Fix Travis CI 2019-01-12 16:31:06 -08:00
Sebastian Messmer
6a7cadef8b Fix Travis CI 2019-01-12 16:30:31 -08:00
Sebastian Messmer
aabe4cadb8 Update to crypto++ 8.0. This fixes an bug where non-AESNI CPUs on Windows decrypted incorrectly 2019-01-12 11:29:33 -08:00
Sebastian Messmer
cab2465263 Make traversal exception safe 2019-01-06 10:26:51 -08:00
Sebastian Messmer
6c006721a7 Make traversal exception safe 2019-01-06 10:25:50 -08:00
Sebastian Messmer
8b1b685475 Remove unused variable 2018-12-31 16:04:40 +01:00
Sebastian Messmer
b5b21d1475 Remove unused variable 2018-12-31 16:04:18 +01:00
Sebastian Messmer
f7c2421ba9 Enable tsan for cryfs-cli-test 2018-12-31 16:02:44 +01:00
Sebastian Messmer
7cf1de8af2 Enable tsan for cryfs-cli-test 2018-12-31 16:02:28 +01:00
Sebastian Messmer
d981e60971 Enable TSAN for cpp-utils-test 2018-12-31 10:35:53 +01:00
Sebastian Messmer
38e5479613 Enable TSAN for cpp-utils-test 2018-12-31 10:35:39 +01:00
Sebastian Messmer
822e9585fb Merge branch 'feature/library_intermediate' into feature/library_intermediate2 2018-12-30 00:00:09 +01:00
Sebastian Messmer
0d54e2cd92 Merge branch 'feature/either3' into feature/library_intermediate 2018-12-29 23:59:46 +01:00
Sebastian Messmer
4afb99702f Merge branch 'develop' into feature/either3 2018-12-29 23:59:32 +01:00
Sebastian Messmer
ffdf175981 - Add noexcept specifiers
- Add rvalue overloads for left_opt and right_opt
2018-12-29 23:58:52 +01:00
Sebastian Messmer
892cb3e061 fix 2018-12-29 22:38:54 +01:00
Sebastian Messmer
ce612145d1 Merge branch 'feature/library_intermediate' into feature/library_intermediate2 2018-12-29 11:59:04 +01:00
Sebastian Messmer
91aba83b1e Merge branch 'feature/either3' into feature/library_intermediate 2018-12-29 11:58:52 +01:00
Sebastian Messmer
a1ed40fe56 fix 2018-12-29 11:58:38 +01:00
Sebastian Messmer
8c8a490da0 Merge branch 'feature/library_intermediate' into feature/library_intermediate2 2018-12-28 09:48:12 +01:00
Sebastian Messmer
981b663765 Merge branch 'feature/either3' into feature/library_intermediate 2018-12-28 09:47:57 +01:00
Sebastian Messmer
795ccd4a0b Merge branch 'feature/either2' into feature/either3 2018-12-28 09:47:37 +01:00
Sebastian Messmer
6663ffd036 fix 2018-12-28 09:47:22 +01:00
Sebastian Messmer
a1e2fc4967 Merge branch 'develop' into feature/either2 2018-12-28 09:44:32 +01:00