Bug 1450967 - MITM error string update, r=keeler

Differential Revision: https://phabricator.services.mozilla.com/D894

--HG--
extra : rebase_source : fe99a9d36c0a08b129f3008ac7b5e7b0dc1dd2ca

security/manager/locales/en-US/chrome/pipnss/nsserrors.properties

@@ -329,4 +329,3 @@ MOZILLA_PKIX_ERROR_INVALID_INTEGER_ENCODING=The server presented a certificate t
 MOZILLA_PKIX_ERROR_EMPTY_ISSUER_NAME=The server presented a certificate with an empty issuer distinguished name.
 MOZILLA_PKIX_ERROR_ADDITIONAL_POLICY_CONSTRAINT_FAILED=An additional policy constraint failed when validating this certificate.
 MOZILLA_PKIX_ERROR_SELF_SIGNED_CERT=The certificate is not trusted because it is self-signed.
-MOZILLA_PKIX_ERROR_MITM_DETECTED=Your connection is being intercepted by a TLS proxy. Uninstall it if possible or configure Firefox to trust its root certificate.

security/manager/locales/en-US/chrome/pipnss/pipnss.properties

@@ -287,6 +287,7 @@ certErrorTrust_Issuer=The certificate is not trusted because the issuer certific
 certErrorTrust_SignatureAlgorithmDisabled=The certificate is not trusted because it was signed using a signature algorithm that was disabled because that algorithm is not secure.
 certErrorTrust_ExpiredIssuer=The certificate is not trusted because the issuer certificate has expired.
 certErrorTrust_Untrusted=The certificate does not come from a trusted source.
+certErrorTrust_MitM=Your connection is being intercepted by a TLS proxy. Uninstall it if possible or configure your device to trust its root certificate.
 
 certErrorMismatch=The certificate is not valid for the name %S.
 # LOCALIZATION NOTE (certErrorMismatchSinglePrefix): %S is replaced by the domain for which the certificate is valid

security/manager/ssl/nsNSSErrors.cpp

@@ -31,6 +31,10 @@ nsNSSErrors::getOverrideErrorStringName(PRErrorCode aErrorCode)
     case SEC_ERROR_REUSED_ISSUER_AND_SERIAL:
       id_str = "PSMERR_HostReusedIssuerSerial";
       break;
+
+    case mozilla::pkix::MOZILLA_PKIX_ERROR_MITM_DETECTED:
+      id_str = "certErrorTrust_MitM";
+      break;
   }
 
   return id_str;

security/pkix/lib/pkixnss.cpp

@@ -218,7 +218,7 @@ RegisterErrorTable()
       "The certificate is not trusted because it is self-signed." },
     { "MOZILLA_PKIX_ERROR_MITM_DETECTED",
       "Your connection is being intercepted by a TLS proxy. Uninstall it if "
-      "possible or configure Firefox to trust its root certificate." },
+      "possible or configure your device to trust its root certificate." },
   };
   // Note that these error strings are not localizable.
   // When these strings change, update the localization information too.