diff options
| author | Franziskus Kiefer <franziskuskiefer@gmail.com> | 2018-03-16 11:36:50 +0100 |
|---|---|---|
| committer | Franziskus Kiefer <franziskuskiefer@gmail.com> | 2018-03-16 11:36:50 +0100 |
| commit | b433dfc54eee9aaef2fd4cfbf1cfef1d637de0b3 (patch) | |
| tree | 4dec1f2c6cb1ad0da5d455a1d710aa8e9541d63c | |
| parent | 9b703a8d74e1c967746abf4b7e7df3237be7fded (diff) | |
| download | nss-hg-b433dfc54eee9aaef2fd4cfbf1cfef1d637de0b3.tar.gz | |
Bug 1450967 - mitm detection v0.0.1, r=keeler,johannh
Differential Revision: https://phabricator.services.mozilla.com/D839
| -rw-r--r-- | lib/mozpkix/include/pkix/Result.h | 2 | ||||
| -rw-r--r-- | lib/mozpkix/include/pkix/pkixnss.h | 1 | ||||
| -rw-r--r-- | lib/mozpkix/lib/pkixnss.cpp | 3 |
3 files changed, 6 insertions, 0 deletions
diff --git a/lib/mozpkix/include/pkix/Result.h b/lib/mozpkix/include/pkix/Result.h index 3cd52559f..a4241b84b 100644 --- a/lib/mozpkix/include/pkix/Result.h +++ b/lib/mozpkix/include/pkix/Result.h @@ -195,6 +195,8 @@ static const unsigned int FATAL_ERROR_FLAG = 0x800; MOZILLA_PKIX_ERROR_ADDITIONAL_POLICY_CONSTRAINT_FAILED) \ MOZILLA_PKIX_MAP(ERROR_SELF_SIGNED_CERT, 55, \ MOZILLA_PKIX_ERROR_SELF_SIGNED_CERT) \ + MOZILLA_PKIX_MAP(ERROR_MITM_DETECTED, 56, \ + MOZILLA_PKIX_ERROR_MITM_DETECTED) \ MOZILLA_PKIX_MAP(FATAL_ERROR_INVALID_ARGS, FATAL_ERROR_FLAG | 1, \ SEC_ERROR_INVALID_ARGS) \ MOZILLA_PKIX_MAP(FATAL_ERROR_INVALID_STATE, FATAL_ERROR_FLAG | 2, \ diff --git a/lib/mozpkix/include/pkix/pkixnss.h b/lib/mozpkix/include/pkix/pkixnss.h index b999426c4..39ba705a2 100644 --- a/lib/mozpkix/include/pkix/pkixnss.h +++ b/lib/mozpkix/include/pkix/pkixnss.h @@ -89,6 +89,7 @@ enum ErrorCode MOZILLA_PKIX_ERROR_EMPTY_ISSUER_NAME = ERROR_BASE + 12, MOZILLA_PKIX_ERROR_ADDITIONAL_POLICY_CONSTRAINT_FAILED = ERROR_BASE + 13, MOZILLA_PKIX_ERROR_SELF_SIGNED_CERT = ERROR_BASE + 14, + MOZILLA_PKIX_ERROR_MITM_DETECTED = ERROR_BASE + 15, END_OF_LIST }; diff --git a/lib/mozpkix/lib/pkixnss.cpp b/lib/mozpkix/lib/pkixnss.cpp index 24b11ce9a..d95512c12 100644 --- a/lib/mozpkix/lib/pkixnss.cpp +++ b/lib/mozpkix/lib/pkixnss.cpp @@ -216,6 +216,9 @@ RegisterErrorTable() "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." }, }; // Note that these error strings are not localizable. // When these strings change, update the localization information too. |