Linux Cert manager: improve PKCS #12 import error messages.

chrome/app/generated_resources.grd

Index: chrome/app/generated_resources.grd
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index e5f9573ca083ae96ea0ef60d7368c2f696b69275..3704be31e3626670ae456aabffd0121d78791da9 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -3350,6 +3350,15 @@ are declared in build/common.gypi.
       <message name="IDS_CERT_MANAGER_PKCS12_IMPORT_ERROR_TITLE" desc="The title in the error dialog for PKCS #12 file import errors.">
         PKCS #12 Import Error
       </message>
+      <message name="IDS_CERT_MANAGER_PKCS12_IMPORT_INVALID_MAC" desc="The message in the error dialog for PKCS #12 files with invalid MAC.">
+        Incorrect password or corrupt file.

[wtc, 2011/07/12 20:22:38]

Does an incorrect password cause the invalid MAC error?

[mattm, 2011/07/12 22:56:36]

Based on the SEC_ERROR_PKCS12_INVALID_MAC entry in:
http://www.mozilla.org/projects/security/pki/nss/ref/ssl/sslerr.html

Dunno if it's accurate though.  The tests I've done with incorrect passwords
return the SEC_ERROR_BAD_PASSWORD error, but perhaps it requires some certain
conditions to occur.

[wtc, 2011/07/13 00:51:07]

Thank you for the explanation.

I found this NSS code, which also says that an incorrect
password may cause the invalid MAC error:
http://bonsai.mozilla.org/cvsblame.cgi?file=mozilla/security/nss/lib/pkcs12/p...

+      </message>
+      <message name="IDS_CERT_MANAGER_PKCS12_IMPORT_INVALID" desc="The message in the error dialog for corrupt PKCS #12 files.">
+        Invalid or corrupt file.
+      </message>
+      <message name="IDS_CERT_MANAGER_PKCS12_IMPORT_UNSUPPORTED" desc="The message in the error dialog for unsupported PKCS #12 files.">
+        File uses unsupported features.
+      </message>
       <message name="IDS_CERT_MANAGER_READ_ERROR_FORMAT" desc="The text in the error dialog for PKCS #12 file read errors.">
         There was an error while trying to read the file: <ph name="ERROR_TEXT">$1<ex>File not found.</ex></ph>.
       </message>