Added initial support for multiple digests.

Author: dghgit

pkix/src/main/java/org/bouncycastle/mime/smime/SMimeMultipartContext.java

@@ -14,6 +14,7 @@
 import org.bouncycastle.operator.DigestCalculator;
 import org.bouncycastle.operator.OperatorCreationException;
 import org.bouncycastle.util.io.TeeInputStream;
+import org.bouncycastle.util.io.TeeOutputStream;
 
 public class SMimeMultipartContext
     implements MimeMultipartContext
@@ -24,15 +25,34 @@ public class SMimeMultipartContext
     public SMimeMultipartContext(MimeParserContext parserContext, Headers headers)
     {
         this.parserContext = (SMimeParserContext)parserContext;
-        this.calculators = createDigestCalculators();
+        this.calculators = createDigestCalculators(headers);
     }
 
     DigestCalculator[] getDigestCalculators()
     {
         return calculators;
     }
 
-    private DigestCalculator[] createDigestCalculators()
+    OutputStream getDigestOutputStream()
+    {
+        if (calculators.length == 1)
+        {
+            return calculators[0].getOutputStream();
+        }
+        else
+        {
+            OutputStream compoundStream = calculators[0].getOutputStream();
+
+            for (int i = 1; i < calculators.length; i++)
+            {
+                compoundStream = new TeeOutputStream(calculators[i].getOutputStream(), compoundStream);
+            }
+
+            return compoundStream;
+        }
+    }
+
+    private DigestCalculator[] createDigestCalculators(Headers headers)
     {
         try
         {
@@ -56,7 +76,7 @@ public InputStream applyContext(Headers headers, InputStream contentStream)
             {
                 if (partNo == 0)
                 {
-                    OutputStream digestOut = SMimeMultipartContext.this.getDigestCalculators()[0].getOutputStream();
+                    OutputStream digestOut = getDigestOutputStream();
 
                     headers.dumpHeaders(digestOut);
 

pkix/src/main/java/org/bouncycastle/mime/smime/SMimeParserListener.java

@@ -24,15 +24,15 @@
 public abstract class SMimeParserListener
     implements MimeParserListener
 {
-    private DigestCalculator digestCalculator;
+    private DigestCalculator[] digestCalculators;
     private SMimeMultipartContext parent;
 
     public MimeContext createContext(MimeParserContext parserContext, Headers headers)
     {
         if (headers.isMultipart())
         {
             parent = new SMimeMultipartContext(parserContext, headers);
-            this.digestCalculator = parent.getDigestCalculators()[0];
+            this.digestCalculators = parent.getDigestCalculators();
             return parent;
         }
         else
@@ -50,9 +50,12 @@ public void object(MimeParserContext parserContext, Headers headers, InputStream
             {
                 Map<ASN1ObjectIdentifier, byte[]> hashes = new HashMap<ASN1ObjectIdentifier, byte[]>();
 
-                digestCalculator.getOutputStream().close();
+                for (int i = 0; i != digestCalculators.length; i++)
+                {
+                    digestCalculators[i].getOutputStream().close();
 
-                hashes.put(digestCalculator.getAlgorithmIdentifier().getAlgorithm(), digestCalculator.getDigest());
+                    hashes.put(digestCalculators[i].getAlgorithmIdentifier().getAlgorithm(), digestCalculators[i].getDigest());
+                }
 
                 CMSSignedData signedData = new CMSSignedData(hashes, Streams.readAll(inputStream));