Sebastian Messmer
|
e7f50badea
|
Fix unintentionally setting the thread name twice
|
2019-06-06 20:34:49 -07:00 |
|
Sebastian Messmer
|
f3b71f058a
|
Update to spdlog 1.3.1
|
2019-06-03 19:09:13 -07:00 |
|
Sebastian Messmer
|
e927a001e9
|
Remove unused variable
|
2019-06-01 20:42:20 -07:00 |
|
Sebastian Messmer
|
e26c76d5c9
|
Merge branch 'release/0.10' into develop
|
2019-06-01 20:04:36 -07:00 |
|
Sebastian Messmer
|
251272b517
|
Fix a race condition when a file descriptor is closed while there's read/write requests for that file being processed.
|
2019-06-01 19:27:47 -07:00 |
|
Sebastian Messmer
|
0aa0b64712
|
Refactor traversl in cryfs-stats
|
2019-05-26 02:34:26 -07:00 |
|
Sebastian Messmer
|
c5febd032a
|
Merge branch 'release/0.10' into develop
|
2019-05-25 20:19:44 -07:00 |
|
Sebastian Messmer
|
ad5b1e72e3
|
Improve fspp logging
|
2019-05-25 19:25:28 -07:00 |
|
Sebastian Messmer
|
412a1ecb90
|
Silence unused parameter warning
|
2019-05-25 14:22:45 -07:00 |
|
Sebastian Messmer
|
1d422cbb38
|
Fix occasional crash in mkdir() on Windows
|
2019-05-25 13:35:44 -07:00 |
|
Sebastian Messmer
|
7d40937b9a
|
Better logging when local state can't be loaded
|
2019-05-25 12:28:13 -07:00 |
|
Sebastian Messmer
|
85cc1669a2
|
Merge from release/0.10
|
2019-04-03 18:44:48 -07:00 |
|
Sebastian Messmer
|
951f76af15
|
Fix building with Boost 1.67
|
2019-04-03 18:36:53 -07:00 |
|
Sebastian Messmer
|
276e7f08e4
|
Switch from libunwind to boost::stacktrace
|
2019-04-01 19:18:49 -07:00 |
|
Sebastian Messmer
|
807f0dc01b
|
Use libunwind instead of libbacktrace to build stack traces. This fixes a segfault issue with platforms using libexecinfo and is generally more portable.
|
2019-03-25 09:29:58 -07:00 |
|
Sebastian Messmer
|
96ae461d34
|
Remove superfluous SignalHandlerRunningRAII (it is already called inside SignalHandler.h)
|
2019-03-24 20:53:22 -07:00 |
|
Sebastian Messmer
|
e07a1c5604
|
Extract SignalHandler from SignalCatcher and also use it for backtrace
|
2019-03-24 20:52:53 -07:00 |
|
Sebastian Messmer
|
14ad22570d
|
Remove superfluous SignalHandlerRunningRAII (it is already called inside SignalHandler.h)
|
2019-03-24 18:11:46 -07:00 |
|
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
|
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
|
f573843f27
|
Fix --unmount--idle
|
2019-02-28 02:29:10 -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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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 |
|
Sebastian Messmer
|
bae8707d64
|
Fix deadlock
|
2018-12-27 10:17:32 +01:00 |
|
Sebastian Messmer
|
2bae1281c6
|
Fix deadlock
|
2018-12-27 10:13:58 +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
|
19a08d37f1
|
Merge branch 'feature/either2' into feature/either3
|
2018-12-25 19:54:21 +01:00 |
|
Sebastian Messmer
|
8c02968898
|
Merge branch 'feature/optional_fix' into feature/either2
|
2018-12-25 19:54:10 +01:00 |
|
Sebastian Messmer
|
a86ac8241d
|
fix clang-tidy
|
2018-12-25 19:50:53 +01:00 |
|
Sebastian Messmer
|
7868acad1a
|
Merge branch 'feature/library_intermediate' into feature/library_intermediate2
|
2018-12-25 10:43:07 +01:00 |
|
Sebastian Messmer
|
b6c72a2a6c
|
merge
|
2018-12-25 10:42:53 +01:00 |
|
Sebastian Messmer
|
8f9dcad559
|
Re-enable light_opt()&& and left_opt()&&
|
2018-12-25 10:40:46 +01:00 |
|