Skip to content

Commit 4b3d9ff

Browse files
committed
Merge branch 'develop'
2 parents f4ad964 + fb2f477 commit 4b3d9ff

File tree

2 files changed

+23
-12
lines changed

2 files changed

+23
-12
lines changed

docs/desktop/volume-type.md

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -81,22 +81,29 @@ Using WebDAV on Windows has the following drawbacks:
8181

8282
**Requirements:** macOS, macFUSE installed
8383

84-
:::warning
85-
Apple has deprecated the OS APIs used by macFUSE since macOS 12.3 and made installation difficult. We recommend you to use FUSE-T and only fallback to macFUSE, if there are any errors.
86-
:::
87-
88-
macFUSE volume type depends on a library provided by the [macFUSE project](https://osxfuse.github.io/).
84+
macFUSE is the most mature FUSE implementation for macOS.
85+
If you're comfortable with booting into recovery mode once to enable loading of kernel extensions, this is the recommended option for best compatibility and stability.
86+
macFUSE volume type depends on a library provided by the [macFUSE project](https://macfuse.github.io/).
8987
It is not included with Cryptomator due to license restrictions.
90-
However, you can install the latest version from [macFUSE's release page](https://github.com/osxfuse/osxfuse/releases).
88+
You can install the latest version from [macFUSE's release page](https://github.com/macfuse/macfuse/releases), following the [installation guide](https://github.com/macfuse/macfuse/wiki/Getting-Started).
9189

9290
By default, unlocked vaults are mounted to `/Volumes`.
93-
Info on custom mount options is available at [macFUSE wiki](https://github.com/osxfuse/osxfuse/wiki/Mount-options).
91+
Info on custom mount options is available at [macFUSE wiki](https://github.com/macfuse/macfuse/wiki/Mount-options).
92+
93+
:::note
94+
macFUSE has been relying on kernel extensions. Apple has deprecated kernel extensions with macOS 12.3, which requires additional steps during installation.
95+
96+
Despite this, macFUSE remains the most stable option due to its maturity.
97+
98+
Furthermore, macFUSE has already released [experimental support for FSKit](https://github.com/macfuse/macfuse/issues/1025#issuecomment-2850724070), which will eventually replace the older VFS API.
99+
:::
94100

95101
### FUSE-T (Experimental) {#fuse-t}
96102

97103
**Requirements:** macOS, FUSE-T installed
98104

99-
This volume type depends on a library provided by the new [FUSE-T project](https://www.fuse-t.org/).
105+
FUSE-T is a newer alternative that runs entirely in user space, avoiding the need for kernel extensions.
106+
This volume type depends on a library provided by the [FUSE-T project](https://www.fuse-t.org/).
100107
You can install it using brew:
101108

102109
```shell
@@ -107,16 +114,19 @@ brew install fuse-t
107114
By default, unlocked vaults are mounted to `~/Cryptomator/`.
108115
Info on custom mount options is available at [wiki of the FUSE-T project](https://github.com/macos-fuse-t/fuse-t/wiki#supported-mount-options).
109116

110-
:::note
111-
FUSE-T is a new project, so support for it is currently marked as experimental. Be sure to keep FUSE-T up to date to benefit from the latest improvements.
117+
:::warning
118+
FUSE-T is less mature than macFUSE and some users have reported occasional malfunctions.
119+
Consider using macFUSE if you experience issues.
112120
:::
113121

114122
### WebDAV (AppleScript) {#webdav-applescript}
115123

116124
**Requirements:** macOS
117125

118-
WebDAV on macOS utilizes the scripting language [AppleScript](https://developer.apple.com/library/archive/documentation/AppleScript/Conceptual/AppleScriptLangGuide/introduction/ASLR_intro.html) to mount/unmount the virtual drive.
126+
WebDAV requires no additional software installation and utilizes the scripting language [AppleScript](https://developer.apple.com/library/archive/documentation/AppleScript/Conceptual/AppleScriptLangGuide/introduction/ASLR_intro.html) to mount/unmount the virtual drive.
119127
By default, unlocked vaults are mounted to `/Volumes`.
128+
While sufficient for most file operations, the experience may feel less polished due to security warnings about the localhost connection not being secure.
129+
These warnings are expected since no certificate authority will issue TLS certificates for localhost.
120130

121131
## Linux-Based OS {#linux-based-os}
122132

docs/security/verify-installers.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,9 @@ Our Windows installers are signed using a code signing certificate. You can veri
4545
On macOS, you can verify the code signature of the Cryptomator app using the built-in `codesign` utility. This verification confirms the app's authenticity and integrity:
4646

4747
1. Open Terminal (found in Applications > Utilities).
48-
2. Run the following command to check the signature:
48+
2. Run either of the following commands to check the signature of the corresponding file:
4949
```
50+
codesign -dv ~/Downloads/Cryptomator-*.dmg
5051
codesign -dv /Applications/Cryptomator.app
5152
```
5253
3. Verify that the output includes:

0 commit comments

Comments
 (0)