Commit Graph

2766 Commits

Author SHA1 Message Date
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 86600e7253 Mark 0.9.10 as released 2019-01-20 19:39:01 -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 f201addbaf Use Ninja cmake generator on appveyor CI 2019-01-20 12:37:10 -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 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