From 49d24e973df1afb46c4fc6ade205daffdaab1faa Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Mon, 13 Feb 2017 11:28:16 +0100 Subject: [PATCH] Enigma: Fix handling of messages with nested PGP encrypted parts (#5634) --- CHANGELOG | 1 + plugins/enigma/lib/enigma_engine.php | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index d8ec24127..022acfb1b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,7 @@ CHANGELOG Roundcube Webmail - Managesieve: Fix handling of scripts with nested rules (#5540) - Fix variable substitution in ldap host for some use-cases, e.g. new_user_identity (#5544) +- Enigma: Fix handling of messages with nested PGP encrypted parts (#5634) - Enigma: Fix PHP fatal error when decrypting a message with invalid signature (#5555) - Enigma: Fix missing require statement for Crypt_GPG_KeyGenerator (#5641) - Fix adding images to new identity signatures diff --git a/plugins/enigma/lib/enigma_engine.php b/plugins/enigma/lib/enigma_engine.php index ed31ddc5e..78ae6359f 100644 --- a/plugins/enigma/lib/enigma_engine.php +++ b/plugins/enigma/lib/enigma_engine.php @@ -404,11 +404,6 @@ class enigma_engine { $part = $p['structure']; - // exit, if we're already inside a decrypted message - if (in_array($part->mime_id, $this->encrypted_parts)) { - return; - } - // Get message body from IMAP server if ($body === null) { $body = $this->get_part_body($p['object'], $part);