Bug 872910 - Remove obsolete mapIssuerOrganization function from Page Info security. r=johannh

MozReview-Commit-ID: AlEyIJwNhSy

--HG--
extra : rebase_source : cce8fa45ddbe6024e57b9dd43044d3eb4dcc148c
This commit is contained in:
Ian Moody 2017-12-05 23:48:37 +00:00
parent 87688fa85a
commit 1fee2c4e61

View File

@ -52,8 +52,7 @@ var security = {
if (!isInsecure && status) {
status.QueryInterface(nsISSLStatus);
var cert = status.serverCert;
var issuerName =
this.mapIssuerOrganization(cert.issuerOrganization) || cert.issuerName;
var issuerName = cert.issuerOrganization || cert.issuerName;
var retval = {
hostName,
@ -132,18 +131,6 @@ var security = {
return null;
},
// Interface for mapping a certificate issuer organization to
// the value to be displayed.
// Bug 82017 - this implementation should be moved to pipnss C++ code
mapIssuerOrganization(name) {
if (!name) return null;
if (name == "RSA Data Security, Inc.") return "Verisign, Inc.";
// No mapping required
return name;
},
/**
* Open the cookie manager window
*/
@ -200,7 +187,7 @@ function securityOnLoad(uri, windowInfo) {
// fields must be specified for subject and issuer so that case is simpler.
if (info.isEV) {
owner = info.cert.organization;
verifier = security.mapIssuerOrganization(info.cAName);
verifier = info.cAName;
} else {
// Technically, a non-EV cert might specify an owner in the O field or not,
// depending on the CA's issuing policies. However we don't have any programmatic
@ -208,9 +195,7 @@ function securityOnLoad(uri, windowInfo) {
// vetting standards are good enough (that's what EV is for) so we default to
// treating these certs as domain-validated only.
owner = pageInfoBundle.getString("securityNoOwner");
verifier = security.mapIssuerOrganization(info.cAName ||
info.cert.issuerCommonName ||
info.cert.issuerName);
verifier = info.cAName || info.cert.issuerCommonName || info.cert.issuerName;
}
} else {
// We don't have valid identity credentials.