From db84317be0d5ec56eb5f1187f607aec4669e574e Mon Sep 17 00:00:00 2001 From: Hocuri Date: Fri, 4 Nov 2022 11:57:49 +0100 Subject: [PATCH] DKIM-Checking: Don't disallowing keychanges for now To get back to a releaseable state - the info stays accessible in the Message-info. We can re-enable it as soon as it has been tested thoroughly. --- src/decrypt.rs | 3 ++- src/mimeparser.rs | 11 ++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/decrypt.rs b/src/decrypt.rs index c2c67a4f8..af4c18adb 100644 --- a/src/decrypt.rs +++ b/src/decrypt.rs @@ -79,7 +79,8 @@ pub async fn prepare_decryption( from, autocrypt_header.as_ref(), message_time, - dkim_results.allow_keychange, + // Disallowing keychanges is disabled for now: + true, // dkim_results.allow_keychange, ) .await?; diff --git a/src/mimeparser.rs b/src/mimeparser.rs index c87c627e2..9d00c51d7 100644 --- a/src/mimeparser.rs +++ b/src/mimeparser.rs @@ -372,11 +372,12 @@ impl MimeMessage { parser.heuristically_parse_ndn(context).await; parser.parse_headers(context).await?; - if !decryption_info.dkim_results.allow_keychange { - for part in parser.parts.iter_mut() { - part.error = Some("Seems like DKIM failed, this either is an attack or (more likely) a bug in Authentication-Results checking. Please tell us about this at https://support.delta.chat.".to_string()); - } - } + // Disallowing keychanges is disabled for now + // if !decryption_info.dkim_results.allow_keychange { + // for part in parser.parts.iter_mut() { + // part.error = Some("Seems like DKIM failed, this either is an attack or (more likely) a bug in Authentication-Results checking. Please tell us about this at https://support.delta.chat.".to_string()); + // } + // } if warn_empty_signature && parser.signatures.is_empty() { for part in parser.parts.iter_mut() { part.error = Some("No valid signature".to_string());