Skip to content

Commit eb4f37a

Browse files
stephanboschcmouse
authored andcommitted
Update documentation for the addition of SCRAM-*-PLUS SASL mechanisms
1 parent b075cfd commit eb4f37a

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

docs/core/config/auth/mechanisms/overview.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,10 @@ all, because they only support verifying a known cleartext password.
4949
| --------- | ------- |
5050
| CRAM-MD5 | Protects the password in transit against eavesdroppers. Somewhat good support in clients.|
5151
| [[link,auth_digest_md5]] | Somewhat stronger cryptographically than CRAM-MD5, but clients rarely support it. |
52-
| SCRAM-SHA-1 | Salted Challenge Response Authentication Mechanism (SCRAM) SAS and GSS-API Mechanisms. Intended as DIGEST-MD5 replacement. |
52+
| SCRAM-SHA-1 | Salted Challenge Response Authentication Mechanism (SCRAM) SAS and GSS-API Mechanisms. Intended as DIGEST-MD5 replacement. [[rfc,5802]] |
53+
| SCRAM-SHA-1-PLUS| SCRAM-SHA-1 with channel binding support [[rfc,5802]]. |
5354
| SCRAM-SHA-256 | Stronger replacement for SCRAM-SHA-1 [[rfc,7677]]. |
55+
| SCRAM-SHA-256-PLUS| SCRAM-SHA-256 with channel binding support [[rfc,7677]]. |
5456
| APOP | This is a POP3-specific authentication. Similar to CRAM-MD5, but requires storing password in cleartext. |
5557
| [[link,auth_gssapi,GSS-SPNEGO]] | A wrapper mechanism defined by [[rfc,4178]]. Can be accessed via GSSAPI. |
5658
| [[link,auth_gssapi]] | Kerberos v5 support. |

docs/core/config/auth/schemes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ different schemes for a single user.
149149
| --------- | ------- |
150150
| CRAM-MD5 | Used with CRAM-MD5 mechanism. |
151151
| [[link,auth_digest_md5]] | Used with DIGEST-MD5 mechanism. The username is included in the hash, so it's not possible to use the hash for different usernames. |
152-
| SCRAM-SHA-1 | Used with SCRAM-SHA-1 mechanism.<br />[[added,auth_mechanism_scram_sha_added]] |
152+
| SCRAM-SHA-1 | Used with SCRAM-SHA-1 and SCRAM-SHA-1-PLUS mechanisms.<br />[[added,auth_mechanism_scram_sha_added]] |
153153
| SCRAM-SHA-256 | Stronger replacement for SCRAM-SHA-1.<br />[[added,auth_mechanism_scram_sha_added]] |
154154

155155
## Other Supported Password Schemes

docs/core/rfc.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,12 @@ This is a non-exhaustive list of RFCs that Dovecot implements/supports.
2828
- Using TLS with IMAP, POP3 and ACAP ([[rfc,2595]])
2929
- Using Digest Authentication as a SASL Mechanism (DIGEST-MD5) ([[rfc,2831]])
3030
- Salted Challenge Response Authentication Mechanism (SCRAM) ([[rfc,5802]])
31+
- SCRAM-SHA-256 and SCRAM-SHA-256-PLUS Simple Authentication and Security Layer (SASL) Mechanisms ([[rfc,7677]])
3132
- GSS-API (Kerberos V5) SASL Mechanism ([[rfc,4752]])
3233
- A Set of Simple Authentication and Security Layer (SASL) Mechanisms for
3334
OAuth ([[rfc,7628]])
3435
- [Google XOAUTH2 Protocol](https://developers.google.com/gmail/xoauth2_protocol)
36+
- Channel Bindings for TLS 1.3 ([[rfc,9266]])
3537

3638
## POP3
3739

0 commit comments

Comments
 (0)