diff --git a/browser/components/preferences/in-content/privacy.xul b/browser/components/preferences/in-content/privacy.xul
index ec37e90060c7..4396861d12cc 100644
--- a/browser/components/preferences/in-content/privacy.xul
+++ b/browser/components/preferences/in-content/privacy.xul
@@ -672,12 +672,10 @@
&certmgr.tab.others2;
&certmgr.tab.websites3;
&certmgr.tab.ca;
- &certmgr.tab.orphan2;
&certmgr.mine2;
&certmgr.others2;
&certmgr.websites3;
&certmgr.cas2;
- &certmgr.orphans2;
&certmgr.certname;
&certmgr.tokenname;
&certmgr.view2.label;
diff --git a/security/manager/locales/en-US/chrome/pippki/certManager.dtd b/security/manager/locales/en-US/chrome/pippki/certManager.dtd
index e6318e1ce096..2133f3047688 100644
--- a/security/manager/locales/en-US/chrome/pippki/certManager.dtd
+++ b/security/manager/locales/en-US/chrome/pippki/certManager.dtd
@@ -8,13 +8,11 @@
-
-
diff --git a/security/manager/locales/en-US/chrome/pippki/pippki.properties b/security/manager/locales/en-US/chrome/pippki/pippki.properties
index 163384651067..ed3b867ed260 100644
--- a/security/manager/locales/en-US/chrome/pippki/pippki.properties
+++ b/security/manager/locales/en-US/chrome/pippki/pippki.properties
@@ -32,9 +32,6 @@ deleteEmailCertConfirm=Are you sure you want to delete these people’s e-mail c
deleteEmailCertImpactDesc=If you delete a person’s e-mail certificate, you will no longer be able to send encrypted e-mail to that person.
deleteEmailCertTitle=Delete E-Mail Certificates
-deleteOrphanCertConfirm=Are you sure you want to delete these certificates?
-deleteOrphanCertTitle=Delete Certificates
-
# PKCS#12 file dialogs
chooseP12RestoreFileDialog2=Certificate File to Import
chooseP12BackupFileDialog=File Name to Backup
diff --git a/security/manager/pki/resources/content/OrphanOverlay.xul b/security/manager/pki/resources/content/OrphanOverlay.xul
deleted file mode 100644
index c267d0f7bef6..000000000000
--- a/security/manager/pki/resources/content/OrphanOverlay.xul
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- &certmgr.orphans2;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/security/manager/pki/resources/content/certManager.js b/security/manager/pki/resources/content/certManager.js
index 5145895b507e..b1bad26efc53 100644
--- a/security/manager/pki/resources/content/certManager.js
+++ b/security/manager/pki/resources/content/certManager.js
@@ -47,11 +47,6 @@ var emailTreeView;
* @type nsICertTree
*/
var userTreeView;
-/**
- * Cert tree for the "Other" tab.
- * @type nsICertTree
- */
-var orphanTreeView;
function LoadCerts() {
certdb = Components.classes[nsX509CertDB].getService(nsIX509CertDB);
@@ -77,11 +72,6 @@ function LoadCerts() {
userTreeView.loadCertsFromCache(certcache, nsIX509Cert.USER_CERT);
document.getElementById("user-tree").view = userTreeView;
- orphanTreeView = Components.classes[nsCertTree]
- .createInstance(nsICertTree);
- orphanTreeView.loadCertsFromCache(certcache, nsIX509Cert.UNKNOWN_CERT);
- document.getElementById("orphan-tree").view = orphanTreeView;
-
enableBackupAllButton();
}
@@ -95,7 +85,6 @@ function getSelectedCerts() {
var mine_tab = document.getElementById("mine_tab");
var others_tab = document.getElementById("others_tab");
var websites_tab = document.getElementById("websites_tab");
- var orphan_tab = document.getElementById("orphan_tab");
var items = null;
if (ca_tab.selected) {
items = caTreeView.selection;
@@ -105,8 +94,6 @@ function getSelectedCerts() {
items = emailTreeView.selection;
} else if (websites_tab.selected) {
items = serverTreeView.selection;
- } else if (orphan_tab.selected) {
- items = orphanTreeView.selection;
}
selected_certs = [];
var cert = null;
@@ -128,8 +115,6 @@ function getSelectedCerts() {
cert = emailTreeView.getCert(j);
} else if (websites_tab.selected) {
cert = serverTreeView.getCert(j);
- } else if (orphan_tab.selected) {
- cert = orphanTreeView.getCert(j);
}
if (cert) {
var sc = selected_certs.length;
@@ -146,7 +131,6 @@ function getSelectedTreeItems() {
var mine_tab = document.getElementById("mine_tab");
var others_tab = document.getElementById("others_tab");
var websites_tab = document.getElementById("websites_tab");
- var orphan_tab = document.getElementById("orphan_tab");
var items = null;
if (ca_tab.selected) {
items = caTreeView.selection;
@@ -156,8 +140,6 @@ function getSelectedTreeItems() {
items = emailTreeView.selection;
} else if (websites_tab.selected) {
items = serverTreeView.selection;
- } else if (orphan_tab.selected) {
- items = orphanTreeView.selection;
}
selected_certs = [];
selected_tree_items = [];
@@ -181,8 +163,6 @@ function getSelectedTreeItems() {
tree_item = emailTreeView.getTreeItem(j);
} else if (websites_tab.selected) {
tree_item = serverTreeView.getTreeItem(j);
- } else if (orphan_tab.selected) {
- tree_item = orphanTreeView.getTreeItem(j);
}
if (tree_item) {
var sc = selected_tree_items.length;
@@ -278,15 +258,6 @@ function email_enableButtons() {
enableButtonsForCertTree(emailTreeView, idList);
}
-function orphan_enableButtons() {
- let idList = [
- "orphan_viewButton",
- "orphan_exportButton",
- "orphan_deleteButton",
- ];
- enableButtonsForCertTree(orphanTreeView, idList);
-}
-
function backupCerts() {
getSelectedCerts();
var numcerts = selected_certs.length;
@@ -405,7 +376,6 @@ function deleteCerts() {
"websites_tab": serverTreeView,
"ca_tab": caTreeView,
"others_tab": emailTreeView,
- "orphan_tab": orphanTreeView,
};
let selTab = document.getElementById("certMgrTabbox").selectedItem;
let selTabID = selTab.getAttribute("id");
@@ -490,6 +460,4 @@ function addException() {
var certcache = certdb.getCerts();
serverTreeView.loadCertsFromCache(certcache, nsIX509Cert.SERVER_CERT);
serverTreeView.selection.clearSelection();
- orphanTreeView.loadCertsFromCache(certcache, nsIX509Cert.UNKNOWN_CERT);
- orphanTreeView.selection.clearSelection();
}
diff --git a/security/manager/pki/resources/content/certManager.xul b/security/manager/pki/resources/content/certManager.xul
index 5d42efd140e5..de9cc0eb35bf 100644
--- a/security/manager/pki/resources/content/certManager.xul
+++ b/security/manager/pki/resources/content/certManager.xul
@@ -9,7 +9,6 @@
-
@@ -34,14 +33,12 @@
-
-
diff --git a/security/manager/pki/resources/content/deletecert.js b/security/manager/pki/resources/content/deletecert.js
index 24519e7a7952..eebfb688f956 100644
--- a/security/manager/pki/resources/content/deletecert.js
+++ b/security/manager/pki/resources/content/deletecert.js
@@ -83,11 +83,6 @@ function onLoad() {
confirm = bundle.getString("deleteEmailCertConfirm");
impact = bundle.getString("deleteEmailCertImpactDesc");
break;
- case "orphan_tab":
- title = bundle.getString("deleteOrphanCertTitle");
- confirm = bundle.getString("deleteOrphanCertConfirm");
- impact = "";
- break;
default:
return;
}
diff --git a/security/manager/pki/resources/jar.mn b/security/manager/pki/resources/jar.mn
index 960b740acc63..c07bdd09bfdd 100644
--- a/security/manager/pki/resources/jar.mn
+++ b/security/manager/pki/resources/jar.mn
@@ -6,7 +6,6 @@ pippki.jar:
% content pippki %content/pippki/
content/pippki/CAOverlay.xul (content/CAOverlay.xul)
content/pippki/MineOverlay.xul (content/MineOverlay.xul)
- content/pippki/OrphanOverlay.xul (content/OrphanOverlay.xul)
content/pippki/OthersOverlay.xul (content/OthersOverlay.xul)
content/pippki/WebSitesOverlay.xul (content/WebSitesOverlay.xul)
content/pippki/certDump.xul (content/certDump.xul)
diff --git a/security/manager/ssl/nsCertTree.cpp b/security/manager/ssl/nsCertTree.cpp
index f040ede88675..70e5b099d514 100644
--- a/security/manager/ssl/nsCertTree.cpp
+++ b/security/manager/ssl/nsCertTree.cpp
@@ -483,14 +483,6 @@ nsCertTree::GetCertsByTypeFromCertList(CERTCertList *aCertList,
addOverrides = true;
}
else
- if (aWantedType == nsIX509Cert::UNKNOWN_CERT
- && thisCertType == nsIX509Cert::UNKNOWN_CERT) {
- // This unknown cert was stored without trust.
- // If there are associated overrides, do not show as unknown.
- // If there are no associated overrides, display as unknown.
- wantThisCertIfNoOverrides = true;
- }
- else
if (aWantedType == nsIX509Cert::SERVER_CERT
&& thisCertType == nsIX509Cert::SERVER_CERT) {
// This server cert is explicitly marked as a web site peer,
diff --git a/security/manager/ssl/tests/mochitest/browser/browser_deleteCert_ui.js b/security/manager/ssl/tests/mochitest/browser/browser_deleteCert_ui.js
index f08811333f4c..05d278469b2f 100644
--- a/security/manager/ssl/tests/mochitest/browser/browser_deleteCert_ui.js
+++ b/security/manager/ssl/tests/mochitest/browser/browser_deleteCert_ui.js
@@ -181,16 +181,6 @@ add_task(async function testDeleteCACerts() {
expectedImpact);
});
-// Test deleting certs from the "Other" tab.
-add_task(async function testDeleteOtherCerts() {
- const expectedTitle = "Delete Certificates";
- const expectedConfirmMsg =
- "Are you sure you want to delete these certificates?";
- const expectedImpact = "";
- await testHelper("orphan_tab", expectedTitle, expectedConfirmMsg,
- expectedImpact);
-});
-
// Test that the right values are returned when the dialog is accepted.
add_task(async function testAcceptDialogReturnValues() {
let [win, retVals] = await openDeleteCertConfirmDialog("ca_tab" /* arbitrary */);