Bugs 1507218 and 1528615

Tag #1273

2 files changed, 14 insertions, 9 deletions

diff --git a/mailnews/mime/public/nsICMSMessage.idl b/mailnews/mime/public/nsICMSMessage.idl
index 1d67bf51d..ffa2aac7e 100644
--- a/mailnews/mime/public/nsICMSMessage.idl
+++ b/mailnews/mime/public/nsICMSMessage.idl
@@ -28,7 +28,9 @@ interface nsICMSMessage : nsISupports
   void getSignerCert(out nsIX509Cert scert);
   void getEncryptionCert(out nsIX509Cert ecert);
   void verifySignature();
-  void verifyDetachedSignature(in UnsignedCharPtr aDigestData, in unsigned long aDigestDataLen);
+  void verifyDetachedSignature(in UnsignedCharPtr aDigestData,
+                               in unsigned long aDigestDataLen,
+                               in int16_t aDigestType);
   void CreateEncrypted(in nsIArray aRecipientCerts);
 
   /* The parameter aDigestType must be one of the values in nsICryptoHash */
diff --git a/mailnews/mime/public/nsICMSMessage2.idl b/mailnews/mime/public/nsICMSMessage2.idl
index 9360279c6..f353c32a2 100644
--- a/mailnews/mime/public/nsICMSMessage2.idl
+++ b/mailnews/mime/public/nsICMSMessage2.idl
@@ -11,7 +11,7 @@ interface nsISMimeVerificationListener;
 /*
  * This interface is currently not marked scriptable,
  * because its verification functions are meant to look like those
- * in nsICMSMessage. At the time the ptr type is eliminated in both 
+ * in nsICMSMessage. At the time the ptr type is eliminated in both
  * interfaces, both should be made scriptable.
  */
 
@@ -21,19 +21,19 @@ interface nsICMSMessage2 : nsISupports
   /**
     * Async version of nsICMSMessage::VerifySignature.
     * Code will be executed on a background thread and
-    * availability of results will be notified using a 
+    * availability of results will be notified using a
     * call to nsISMimeVerificationListener.
    */
   void asyncVerifySignature(in nsISMimeVerificationListener listener);
-  
+
   /**
     * Async version of nsICMSMessage::VerifyDetachedSignature.
     * Code will be executed on a background thread and
-    * availability of results will be notified using a 
+    * availability of results will be notified using a
     * call to nsISMimeVerificationListener.
     *
-    * We are using "native unsigned char" ptr, because the function 
-    * signatures of this one and nsICMSMessage::verifyDetachedSignature 
+    * We are using "native unsigned char" ptr, because the function
+    * signatures of this one and nsICMSMessage::verifyDetachedSignature
     * should be the identical. Cleaning up nsICMSMessages needs to be
     * postponed, because this async version is needed on MOZILLA_1_8_BRANCH.
     *
@@ -42,10 +42,13 @@ interface nsICMSMessage2 : nsISupports
     *     [array, length_is(aDigestDataLen)]
     *     in octet aDigestData,
     *     in unsigned long aDigestDataLen);
+    *
+    * Set aDigestType to one of the values from nsICryptoHash.
    */
   void asyncVerifyDetachedSignature(in nsISMimeVerificationListener listener,
-                                     in UnsignedCharPtr aDigestData, 
-                                     in unsigned long aDigestDataLen);
+                                    in UnsignedCharPtr aDigestData,
+                                    in unsigned long aDigestDataLen,
+                                    in int16_t aDigestType);
 };
 
 [uuid(5226d698-0773-4f25-b94c-7944b3fc01d3)]