Commit Graph

729 Commits

Author SHA1 Message Date
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
Sebastian Messmer 0444b809a2 Merge branch 'develop' into feature/either 2018-12-24 09:13:31 +01:00
Sebastian Messmer b36aa1b272 More test cases for CryConfigTest 2018-12-22 01:22:43 +01:00
Sebastian Messmer 99688e51ab Use either<> to indicate errors in config file loading 2018-12-22 00:58:30 +01:00
Sebastian Messmer 944cb6c3c5 Return error code when integrity violation is encountered 2018-12-18 21:40:03 -08:00
Sebastian Messmer 5d77a82c7f Fix test cases 2018-12-18 21:36:13 -08:00
Sebastian Messmer 9ebd3d754c Fix test cases 2018-12-18 21:34:20 -08:00
Sebastian Messmer d68247070f When an integrity violation occurs, gracefully unmount the file system and refuse to mount on future attempts 2018-12-10 21:20:18 -08:00
Sebastian Messmer 64150f294e Fuse offers an onMounted callback that is called when everything is ready. 2018-12-09 12:27:53 -05:00
Sebastian Messmer 449133e3da - Allow callback when fuse filesystem is mounted
- Use that callback to initialize the file system instead of initializing it up front
2018-12-03 01:57:30 -05:00
Sebastian Messmer d761dba894 Merge branch 'feature/cleanup_keyprovider' into develop 2018-10-27 22:47:13 -07:00
Sebastian Messmer ff142883b6 TODOs 2018-10-27 22:46:41 -07:00
Sebastian Messmer 187b9ceb53 [wip] Implement either type 2018-10-27 22:34:28 -07:00
Sebastian Messmer 596b04acce Introduce a CryPresetPasswordBasedKeyProvider for when the password is already known 2018-10-27 20:36:54 -07:00
Sebastian Messmer 74cd8abf05 Introduce CryKeyProvider to have an abstraction layer that allows plugging in non-password-based key providers 2018-10-27 09:48:57 -07:00
Sebastian Messmer 954d6662f6 Simplify: key size is only known at runtime, not a template parameter anymore 2018-10-21 22:53:53 +02:00
Sebastian Messmer 10f8adbb73 Use NiceMock to reduce the log size on Travis CI because we're close to the 4MB limit 2018-10-19 20:34:51 +02:00
Sebastian Messmer 4b26c67146 Fix clang-tidy warnings 2018-10-14 22:26:30 +02:00
Sebastian Messmer ff62fe9e84 Fix data race in test case 2018-09-26 20:10:43 -07:00
Sebastian Messmer 9102c06356 Remove obsolete test case 2018-09-23 21:58:32 -07:00
Sebastian Messmer 5da8eac56e Remove unused parameter from statfs() 2018-09-22 14:24:31 -07:00
Sebastian Messmer 3697e9eff4 Disable FuseStatfsPathParameterTest on osx 2018-09-22 12:25:43 -07:00
Sebastian Messmer 56ffe708e2 Fix cpp-utils-test on 32bit Windows 2018-09-19 03:01:31 -07:00
Sebastian Messmer 9a7b9878f5 Change error handling in HttpClient 2018-09-16 23:37:12 -07:00
Sebastian Messmer 1dff0aca85 Don't build fspp-test on Windows because it doesn't work yet 2018-09-16 01:17:14 -07:00
Sebastian Messmer 0769039052 Fix build 2018-09-16 00:06:54 -07:00
Sebastian Messmer a866fda3a9 Use FUSE_STAT on Dokan 2018-09-15 18:02:03 -07:00
Sebastian Messmer 347be60ba6 Fix inline 2018-09-15 17:41:39 -07:00
Sebastian Messmer 8d21e09159 Introduce fspp::num_bytes_t 2018-09-15 14:32:58 -07:00
Sebastian Messmer b1dfd94243 Introduce fspp::uid_t, fspp::gid_t and fspp::mode_t 2018-09-14 02:34:11 -07:00
Sebastian Messmer ac63b5af85 Add FlagsValueType 2018-09-14 01:31:38 -07:00
Sebastian Messmer ee80327c45 Fix ValueTypeTest for Windows 2018-09-14 00:59:27 -07:00
Sebastian Messmer 63c5d20453 Decouple stat because dokan-fuse and fuse have different structs for that 2018-09-13 22:38:05 -07:00
Sebastian Messmer d6b1a6e25d Reduce flakiness in CallAfterTimeoutTest 2018-09-13 18:41:58 -07:00
Sebastian Messmer 5ad55b1d58 - UnswappableAllocator
- EncryptionKey uses UnswappableAllocator
2018-09-11 21:51:31 -07:00
Sebastian Messmer 1f363fce62 Introduce Allocators to cpputils::Data 2018-09-11 18:49:13 -07:00
Sebastian Messmer 4afe1eb780 Decouple statvfs 2018-09-11 18:26:33 -07:00
Sebastian Messmer 121de7d7ab Remove some unneeded headers 2018-09-11 00:50:59 -07:00
Sebastian Messmer 498c9da860 Fix CI for osx 2018-09-10 13:11:00 -07:00
Sebastian Messmer 6ada5166e9 Fix CliTest regex checks in unit tests on Windows 2018-09-07 21:32:27 -07:00
Sebastian Messmer af1ed483cf On Windows, disable a few test cases that don't work 2018-09-07 21:32:09 -07:00
Sebastian Messmer 1be1b5c26e Don't block if filesystem doesn't finish 2018-09-07 21:32:00 -07:00
Sebastian Messmer afad6ee465 Improve CliTest running of the file system 2018-09-07 19:54:01 -07:00
Sebastian Messmer cef6b13317 Fix relative path construction on Windows 2018-09-07 19:13:20 -07:00
Sebastian Messmer a9e2dea97e Fix argument string ownership 2018-09-07 19:13:20 -07:00
Sebastian Messmer d8b66d0967 - If unmounting doesn't work in test case, don't deadlock but exit with error 2018-09-07 19:13:20 -07:00
Sebastian Messmer de3095a4d4 Fix paths for Windows tests 2018-09-07 19:13:20 -07:00
Sebastian Messmer fafbbb8e3a Portable way to ask for password 2018-09-03 16:51:59 -07:00
Sebastian Messmer 4778c28898 Some MSVC fixes 2018-09-03 16:06:54 -07:00
Sebastian Messmer cb96a5fc0a Portable setenv 2018-09-03 16:06:46 -07:00
Sebastian Messmer 873c51962f Make filetime test cases work on Windows 2018-09-03 02:33:03 -07:00
Sebastian Messmer 2348396ad9 constexpr fix for Windows 2018-09-03 02:29:11 -07:00
Sebastian Messmer 93ed589bf4 Fix includes for Windows 2018-09-03 01:16:29 -07:00
Sebastian Messmer f5040d2d5a Fix Windows counter types 2018-09-03 01:11:12 -07:00
Sebastian Messmer 2d757b028d Windows compatibility for struct stat 2018-09-03 01:08:38 -07:00
Sebastian Messmer a7ee4e5446 Fix backtrace_test on osx 2018-08-08 22:34:57 -04:00
Sebastian Messmer 847dc893c0 Fix compiler warnings 2018-08-08 22:19:20 -04:00
Sebastian Messmer 1233d44b35 Fix CI 2018-08-07 18:54:51 -07:00
Sebastian Messmer 6f175e0b9b Fix CI 2018-08-07 18:04:32 -07:00
Sebastian Messmer acff0e5c39 fix 2018-08-01 17:13:42 -07:00
Sebastian Messmer 355da63a1d Fix top level exception handler on Windows 2018-08-01 17:13:31 -07:00
Sebastian Messmer 1dd88f0a67 Windows compatibility fixes 2018-07-08 19:47:40 -07:00
Sebastian Messmer 07ba168107 Finish IdValueType 2018-05-27 21:03:44 -07:00
Sebastian Messmer e266fa5e98 Add test cases 2018-05-23 23:57:09 -07:00
Sebastian Messmer 0e697eb1f6 Continue implementing ValueType. New approach. 2018-05-23 00:03:32 -07:00