Skip to content

Commit

Permalink
imap/httpd: remove DIGEST-MD5
Browse files Browse the repository at this point in the history
DIGEST-MD5 is declared Historic by RFC 6331 and is removed from Cyrus SASL by
cyrusimap/cyrus-sasl@2ce03b6
  • Loading branch information
dilyanpalauzov committed Oct 7, 2023
1 parent 264b7d9 commit d20b06d
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 5 deletions.
11 changes: 11 additions & 0 deletions changes/next/httpd_remove_digestmd5
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Description:

Remove DIGEST-MD5 from httpd.

Config changes:

In imapd.conf remove sasl_mech_list: DIGEST-MD5

Upgrade instructions:

None
2 changes: 0 additions & 2 deletions imap/httpd.c
Original file line number Diff line number Diff line change
Expand Up @@ -451,8 +451,6 @@ struct auth_scheme_t auth_schemes[] = {
{ AUTH_SCRAM_SHA1, "SCRAM-SHA-1", "SCRAM-SHA-1",
AUTH_NEED_PERSIST | AUTH_SERVER_FIRST | AUTH_BASE64 |
AUTH_REALM_PARAM | AUTH_DATA_PARAM },
{ AUTH_DIGEST, "Digest", HTTP_DIGEST_MECH,
AUTH_NEED_REQUEST | AUTH_SERVER_FIRST },
{ AUTH_NTLM, "NTLM", "NTLM",
AUTH_NEED_PERSIST | AUTH_BASE64 },
{ AUTH_BEARER, "Bearer", NULL,
Expand Down
3 changes: 0 additions & 3 deletions imap/httpd.h
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,8 @@

/* SASL usage based on availability */
#if defined(SASL_NEED_HTTP) && defined(SASL_HTTP_REQUEST)
#define HTTP_DIGEST_MECH "DIGEST-MD5"
#define SASL_USAGE_FLAGS (SASL_NEED_HTTP | SASL_SUCCESS_DATA)
#else
#define HTTP_DIGEST_MECH NULL /* not supported by our SASL version */
#define SASL_USAGE_FLAGS SASL_SUCCESS_DATA
#endif /* SASL_NEED_HTTP */

Expand Down Expand Up @@ -185,7 +183,6 @@ struct auth_scheme_t {
/* Auth scheme identifiers */
enum {
AUTH_BASIC = (1<<0),
AUTH_DIGEST = (1<<1),
AUTH_SPNEGO = (1<<2),
AUTH_NTLM = (1<<3),
AUTH_BEARER = (1<<4),
Expand Down

0 comments on commit d20b06d

Please sign in to comment.