application/pkcs-7-mime part with SignedData might be the *only* part.

See RFC 5751 3.4.2 Fixes Bug: 14363, display of application/pkcs-7-mime signed messages.
horde · Jul 7, 2016 · eea64aa · eea64aa
1 parent 91345a8
commit eea64aa
Showing 1 changed file with 3 additions and 11 deletions.
diff --git a/imp/lib/Mime/Viewer/Smime.php b/imp/lib/Mime/Viewer/Smime.php
@@ -251,7 +251,9 @@ protected function _parseSignedData($sig_only = false)
     {
         $partlist = array_keys($this->_mimepart->contentTypeMap());
         $base_id = reset($partlist);
-        $data_id = next($partlist);
+        if (!$data_id = next($partlist)) {
+            $data_id = $base_id;
+        }
         $sig_id = Horde_Mime::mimeIdArithmetic($data_id, 'next');
 
         /* Initialize inline data. */
@@ -270,16 +272,6 @@ protected function _parseSignedData($sig_only = false)
             return null;
         }
 
-        /* Sanity checking to make sure MIME structure is correct. */
-        if (!in_array($sig_id, $partlist)) {
-            $status->action(IMP_Mime_Status::ERROR);
-            $cache->smime[$base_id]['wrap'] = 'mimePartWrapInvalid';
-            $status->addText(_("Invalid S/MIME data."));
-            /* This will suppress displaying the invalid part. */
-            $cache->smime[$base_id]['sig'] = $data_id;
-            return null;
-        }
-
         $imp_contents = $this->getConfigParam('imp_contents');
         $stream = $imp_contents->isEmbedded($base_id)
             ? $this->_mimepart->getMetadata('imp-smime-decrypt')->stream