Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions data/updates.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ export const updates = {
mail_attachment_detection_options_maildir_changed: '2.4.3',
mail_cache_fields_changed: '2.4.1',
mail_crypt_eddsa: '2.4.0',
mail_crypt_ml_kem_keys: '2.4.4',
mail_crypt_fs_maybe: '2.4.0',
mail_location_keep_noselect: '2.4.0',
mail_location_no_noselect: '2.4.0',
Expand Down
17 changes: 12 additions & 5 deletions docs/core/plugins/mail_crypt.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,10 @@ The encryption keys for the symmetric encryption are randomly
generated. These keys in turn are encrypted using a key derived with from the
provisioned private key.

Provisioned private keys can be Elliptic Curve (EC) keys or RSA Encryption
is done using the Integrated Encryption Scheme (IES). This algorithm is
usable both with EC and RSA keys.
Provisioned keys can be Elliptic Curve (EC) keys or RSA keys.
[[changed,mail_crypt_ml_kem_keys]] ML-KEM keys are also
supported with OpenSSL 3.3+. Encryption is done using the Integrated
Encryption Scheme (IES). This algorithm is usable both with EC and RSA keys.

## Limitations

Expand Down Expand Up @@ -145,8 +146,10 @@ In this mode, all keying material is taken from the settings:
* [[setting,crypt_global_private_key]] - List of
[[setting,crypt_private_key_file]] keys

You can use either Elliptic Curve (EC) keys (recommended) or RSA keys. See
below for examples using them. No key generation is automatically performed.
You can use either Elliptic Curve (EC) keys (recommended) or RSA keys.
[[changed,mail_crypt_ml_kem_keys]] ML-KEM keys are also
supported with OpenSSL 3.3+. See below for examples using them. No key
generation is automatically performed.

A good solution for environments where no user folder sharing is needed is to
generate per-user EC key pair and encrypt that with something derived from
Expand Down Expand Up @@ -442,6 +445,10 @@ compression.

See [[link,mail_crypt_settings]] for generic mail-crypt settings.

`fs-crypt` supports the same key types as `mail-crypt`.
[[changed,mail_crypt_ml_kem_keys]] ML-KEM keys are also
supported with OpenSSL 3.3+.

::: warning
[[changed,fs_crypt_require_encryption_keys]] fs-crypt requires encryption keys
by default.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@
| ARGON2 password scheme | Support for the ARGON2 password scheme was added. |
| SCRAM-SHA-1, SCRAM-SHA-256 | Support SASL mechanisms for outgoing connections. |
| X25519, X448 | [[plugin,mail-crypt]] and [[link,mail_crypt_fs_crypt]] now support these curves. |
| ML-KEM | [[changed,mail_crypt_ml_kem_keys]] [[plugin,mail-crypt]] and [[link,mail_crypt_fs_crypt]] support ML-KEM keys with OpenSSL 3.3+. |
Loading