Skip to content

Commit 4c1bfa1

Browse files
Merge branch 'develop' into feature/update-transitive-dependencies
2 parents e139e84 + 2918159 commit 4c1bfa1

File tree

2 files changed

+15
-7
lines changed

2 files changed

+15
-7
lines changed

docs/desktop/admin-config.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ The following property keys are supported.
5757
| `cryptomator.p12Path=[FilePath]` | The path to the device key. |
5858
| `cryptomator.mountPointsDir=[DirPath]` | The directory where Cryptomator mounts vaults if no per-vault location has been set. |
5959
| `cryptomator.disableUpdateCheck=[Boolean]` | Whether to disable automatic update checks (`true`) or allow them (`false`). Defaults to false. |
60+
| `cryptomator.hub.allowedHosts=[UrlList]` | List of hosts that Cryptomator is allowed to connect to during Hub unlock. List entries are comma separated and each host url consists of `scheme:host:port` (`port` is optional). For example `https://hub1.example.com,https://hub2.example.com:4432` |
61+
| `cryptomator.hub.enableTrustOnFirstUse=[Boolean]` | Whether Cryptomator shall ask the user to trust unknown Hub hosts (`true`) or disallow connection attempts (`false`). A Hub host is considered unknown unless it is well-known (`*.cryptomator.cloud`), listed in `cryptomator.hub.allowedHosts`, or has already been allowed by the user. Defaults to true |
6062

6163

6264
## Substitutions {#substitutions}

docs/security/verify-installers.md

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,25 @@ If shown, you can ignore the following warning:
2626

2727
`gpg: WARNING: This key is not certified with a trusted signature!`
2828

29-
## Windows (exe) {#windows}
29+
## Windows (exe, msi) {#windows}
3030

3131
Our Windows installers are signed using a code signing certificate. You can verify the signature in five simple steps:
3232

3333
<Image src="/img/security/verify-win-installer.png" srcset=" /img/security/verify-win-installer 1x, /img/security/verify-win-installer@2x.png 2x" alt="How to check the code signing certificate on Windows" width="1316" height="767" />
3434

35-
1. Right click on the file and click on Properties.
36-
2. Select the Digital Signatures tab: It should show a signature by `Skymatic GmbH`.
37-
3. Click on Details.
35+
1. Right-click on the file and click on Properties.
36+
2. Select the Digital Signatures tab: It should show one or more signatures by `Skymatic GmbH` under Embedded Signatures.
37+
- For releases since 1.18.0, the `exe` release artifact will have two signatures, and the `msi` release artifact will have one signature.
38+
3. Click on the first signature, and then click Details.
3839
4. Click on View Certificates.
39-
5. Click on Details. The serial number of our certificate should be:
40-
- For releases since July 14, 2022: `d77e4f8b938f56ae265cd08e9193490c`
41-
- For releases from July 3, 2019 to July 3, 2022: `63c45bff1a148d60ed2994d3a2639034`
40+
5. Click the Details tab. Different Cryptomator versions are signed with different certificates. The following list shows for each version the certificate serial number:
41+
- Version 1.19.1: `33000852bd6c3a151ff92180ee0000000852bd`
42+
- Version 1.19.0: `3300083c47651e1daeb99b00eb000000083c47`
43+
- Version 1.18.1: `330007d28ad57305892a81cac600000007d28a`
44+
- Version 1.18.0: `3300052c3561155e2baf361702000000052c35`
45+
- Versions 1.6.11 to 1.17.1: `00d77e4f8b938f56ae265cd08e9193490c`
46+
- Versions 1.4.12 to 1.6.10: `63c45bff1a148d60ed2994d3a2639034`
47+
- Versions up to 1.4.11: `1a360f3933964c71f14e8754d94615d4`
4248

4349
## macOS (app) {#macos}
4450

0 commit comments

Comments
 (0)