Merge from mozilla-central.
authorDavid Anderson <danderson@mozilla.com>
Wed, 15 Aug 2012 14:22:26 -0700
changeset 20375 5bdab97f001d9a307468f6883ddb2b08c8c2fc97
parent 20374 88bc8b93cb04fda6723287c05b40bbb87289499d (current diff)
parent 20366 893424209bf051b2682149c50a980e7c988b5198 (diff)
child 20376 efa60ab5882351c123d7ef6699aadd4f2e842615
push id1209
push usermbanner@mozilla.com
push dateTue, 02 Sep 2014 16:59:36 +0000
treeherdercomm-beta@842e0fd167ee [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
Merge from mozilla-central.
--- a/mailnews/mime/public/nsICMSMessageErrors.idl
+++ b/mailnews/mime/public/nsICMSMessageErrors.idl
@@ -28,66 +28,8 @@ interface nsICMSMessageErrors : nsISuppo
   const long VERIFY_MALFORMED_SIGNATURE = 1037;
   const long VERIFY_HEADER_MISMATCH = 1038;
   const long VERIFY_NOT_YET_ATTEMPTED = 1039;
   const long VERIFY_CERT_WITHOUT_ADDRESS = 1040;
 
   const long ENCRYPT_NO_BULK_ALG = 1056;
   const long ENCRYPT_INCOMPLETE = 1057;
 };
-
-%{ C++
-/**
- * CMS specific nsresult error codes
- */
-
-#define NS_ERROR_CMS_VERIFY_NOT_SIGNED \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SECURITY, \
-                            nsICMSMessageErrors::VERIFY_NOT_SIGNED)
-#define NS_ERROR_CMS_VERIFY_NO_CONTENT_INFO \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SECURITY, \
-                            nsICMSMessageErrors::VERIFY_NO_CONTENT_INFO)
-#define NS_ERROR_CMS_VERIFY_BAD_DIGEST \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SECURITY, \
-                            nsICMSMessageErrors::VERIFY_BAD_DIGEST)
-#define NS_ERROR_CMS_VERIFY_NOCERT \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SECURITY, \
-                            nsICMSMessageErrors::VERIFY_NOCERT)
-#define NS_ERROR_CMS_VERIFY_UNTRUSTED \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SECURITY, \
-                            nsICMSMessageErrors::VERIFY_UNTRUSTED)
-#define NS_ERROR_CMS_VERIFY_ERROR_UNVERIFIED \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SECURITY, \
-                            nsICMSMessageErrors::VERIFY_ERROR_UNVERIFIED)
-#define NS_ERROR_CMS_VERIFY_ERROR_PROCESSING \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SECURITY, \
-                            nsICMSMessageErrors::VERIFY_ERROR_PROCESSING)
-#define NS_ERROR_CMS_VERIFY_BAD_SIGNATURE \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SECURITY, \
-                            nsICMSMessageErrors::VERIFY_BAD_SIGNATURE)
-#define NS_ERROR_CMS_VERIFY_DIGEST_MISMATCH \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SECURITY, \
-                            nsICMSMessageErrors::VERIFY_DIGEST_MISMATCH)
-#define NS_ERROR_CMS_VERIFY_UNKNOWN_ALGO \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SECURITY, \
-                            nsICMSMessageErrors::VERIFY_UNKNOWN_ALGO)
-#define NS_ERROR_CMS_VERIFY_UNSUPPORTED_ALGO \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SECURITY, \
-                            nsICMSMessageErrors::VERIFY_UNSUPPORTED_ALGO)
-#define NS_ERROR_CMS_VERIFY_MALFORMED_SIGNATURE \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SECURITY, \
-                            nsICMSMessageErrors::VERIFY_MALFORMED_SIGNATURE)
-#define NS_ERROR_CMS_VERIFY_HEADER_MISMATCH \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SECURITY, \
-                            nsICMSMessageErrors::VERIFY_HEADER_MISMATCH)
-#define NS_ERROR_CMS_VERIFY_NOT_YET_ATTEMPTED \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SECURITY, \
-                            nsICMSMessageErrors::VERIFY_NOT_YET_ATTEMPTED)
-#define NS_ERROR_CMS_VERIFY_CERT_WITHOUT_ADDRESS \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SECURITY, \
-                            nsICMSMessageErrors::VERIFY_CERT_WITHOUT_ADDRESS)
-#define NS_ERROR_CMS_ENCRYPT_NO_BULK_ALG \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SECURITY, \
-                            nsICMSMessageErrors::ENCRYPT_NO_BULK_ALG)
-#define NS_ERROR_CMS_ENCRYPT_INCOMPLETE \
-  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SECURITY, \
-                            nsICMSMessageErrors::ENCRYPT_INCOMPLETE)
-%}