imap/httpd: remove DIGEST-MD5

DIGEST-MD5 is declared Historic by RFC 6331 and is removed from Cyrus SASL by cyrusimap/cyrus-sasl@2ce03b6
dilyanpalauzov · Oct 7, 2023 · d20b06d · d20b06d
1 parent 264b7d9
commit d20b06d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/changes/next/httpd_remove_digestmd5 b/changes/next/httpd_remove_digestmd5
@@ -0,0 +1,11 @@
+Description:
+
+Remove DIGEST-MD5 from httpd.
+
+Config changes:
+
+In imapd.conf remove sasl_mech_list: DIGEST-MD5
+
+Upgrade instructions:
+
+None
diff --git a/imap/httpd.c b/imap/httpd.c
@@ -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,

diff --git a/imap/httpd.h b/imap/httpd.h
@@ -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 */
 
@@ -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),