secure/caroot, certctl: Rename secure/caroot/blacklisted

Old certctl commands still work for compatability, but are deprecated.

Approved by:	secteam (gordon)
Differential Revision: https://reviews.freebsd.org/D30807

40 files changed, 12 insertions, 12 deletions

diff --git a/secure/caroot/Makefile b/secure/caroot/Makefile
index 50f92ecc6542..c685c5f6cc7a 100644
--- a/secure/caroot/Makefile
+++ b/secure/caroot/Makefile
@@ -3,7 +3,7 @@
 CLEANFILES+=	certdata.txt
 
 SUBDIR+=	trusted
-SUBDIR+=	blacklisted
+SUBDIR+=	untrusted
 
 .include <bsd.obj.mk>
 
diff --git a/secure/caroot/README b/secure/caroot/README
index 9a4fc0320e2a..1e123080559e 100644
--- a/secure/caroot/README
+++ b/secure/caroot/README
@@ -14,8 +14,8 @@ It will:
 
 Then the results should manually be inspected (svn status)
 	1) Any no-longer-trusted certificates should be moved to the
-	blacklisted directory (svn mv)
-	2) any newly added certificates will need to be added (svn add)
+	untrusted directory (git mv)
+	2) any newly added certificates will need to be added (git add)
 
 
 The following make targets exist:
diff --git a/secure/caroot/blacklisted/Makefile b/secure/caroot/blacklisted/Makefile
deleted file mode 100644
index b7ccfbe88c03..000000000000
--- a/secure/caroot/blacklisted/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-BINDIR=		/usr/share/certs/blacklisted
-
-BLACKLISTED_CERTS!=	echo ${.CURDIR}/*.pem 2> /dev/null || true
-
-FILES+=	 ${BLACKLISTED_CERTS}
-
-.include <bsd.prog.mk>
diff --git a/secure/caroot/blacklisted/AddTrust_External_Root.pem b/secure/caroot/untrusted/AddTrust_External_Root.pem
index 701bc7bce072..701bc7bce072 100644
--- a/secure/caroot/blacklisted/AddTrust_External_Root.pem
+++ b/secure/caroot/untrusted/AddTrust_External_Root.pem
diff --git a/secure/caroot/blacklisted/AddTrust_Low-Value_Services_Root.pem b/secure/caroot/untrusted/AddTrust_Low-Value_Services_Root.pem
index 0595db909a49..0595db909a49 100644
--- a/secure/caroot/blacklisted/AddTrust_Low-Value_Services_Root.pem
+++ b/secure/caroot/untrusted/AddTrust_Low-Value_Services_Root.pem
diff --git a/secure/caroot/blacklisted/Camerfirma_Chambers_of_Commerce_Root.pem b/secure/caroot/untrusted/Camerfirma_Chambers_of_Commerce_Root.pem
index cf7de6cc122b..cf7de6cc122b 100644
--- a/secure/caroot/blacklisted/Camerfirma_Chambers_of_Commerce_Root.pem
+++ b/secure/caroot/untrusted/Camerfirma_Chambers_of_Commerce_Root.pem
diff --git a/secure/caroot/blacklisted/Camerfirma_Global_Chambersign_Root.pem b/secure/caroot/untrusted/Camerfirma_Global_Chambersign_Root.pem
index b1fa96bc405e..b1fa96bc405e 100644
--- a/secure/caroot/blacklisted/Camerfirma_Global_Chambersign_Root.pem
+++ b/secure/caroot/untrusted/Camerfirma_Global_Chambersign_Root.pem
diff --git a/secure/caroot/blacklisted/Certum_Root_CA.pem b/secure/caroot/untrusted/Certum_Root_CA.pem
index f815c49ddae0..f815c49ddae0 100644
--- a/secure/caroot/blacklisted/Certum_Root_CA.pem
+++ b/secure/caroot/untrusted/Certum_Root_CA.pem
diff --git a/secure/caroot/blacklisted/Chambers_of_Commerce_Root_-_2008.pem b/secure/caroot/untrusted/Chambers_of_Commerce_Root_-_2008.pem
index 1e3864180a66..1e3864180a66 100644
--- a/secure/caroot/blacklisted/Chambers_of_Commerce_Root_-_2008.pem
+++ b/secure/caroot/untrusted/Chambers_of_Commerce_Root_-_2008.pem
diff --git a/secure/caroot/blacklisted/D-TRUST_Root_CA_3_2013.pem b/secure/caroot/untrusted/D-TRUST_Root_CA_3_2013.pem
index debf7b30c2ef..debf7b30c2ef 100644
--- a/secure/caroot/blacklisted/D-TRUST_Root_CA_3_2013.pem
+++ b/secure/caroot/untrusted/D-TRUST_Root_CA_3_2013.pem
diff --git a/secure/caroot/blacklisted/EC-ACC.pem b/secure/caroot/untrusted/EC-ACC.pem
index a4b43b39414b..a4b43b39414b 100644
--- a/secure/caroot/blacklisted/EC-ACC.pem
+++ b/secure/caroot/untrusted/EC-ACC.pem
diff --git a/secure/caroot/blacklisted/EE_Certification_Centre_Root_CA.pem b/secure/caroot/untrusted/EE_Certification_Centre_Root_CA.pem
index 2fa258f19ee8..2fa258f19ee8 100644
--- a/secure/caroot/blacklisted/EE_Certification_Centre_Root_CA.pem
+++ b/secure/caroot/untrusted/EE_Certification_Centre_Root_CA.pem
diff --git a/secure/caroot/blacklisted/GeoTrust_Global_CA.pem b/secure/caroot/untrusted/GeoTrust_Global_CA.pem
index 49934ff8c673..49934ff8c673 100644
--- a/secure/caroot/blacklisted/GeoTrust_Global_CA.pem
+++ b/secure/caroot/untrusted/GeoTrust_Global_CA.pem
diff --git a/secure/caroot/blacklisted/GeoTrust_Primary_Certification_Authority.pem b/secure/caroot/untrusted/GeoTrust_Primary_Certification_Authority.pem
index 91907ba216f0..91907ba216f0 100644
--- a/secure/caroot/blacklisted/GeoTrust_Primary_Certification_Authority.pem
+++ b/secure/caroot/untrusted/GeoTrust_Primary_Certification_Authority.pem
diff --git a/secure/caroot/blacklisted/GeoTrust_Primary_Certification_Authority_-_G2.pem b/secure/caroot/untrusted/GeoTrust_Primary_Certification_Authority_-_G2.pem
index b03758a63c98..b03758a63c98 100644
--- a/secure/caroot/blacklisted/GeoTrust_Primary_Certification_Authority_-_G2.pem
+++ b/secure/caroot/untrusted/GeoTrust_Primary_Certification_Authority_-_G2.pem
diff --git a/secure/caroot/blacklisted/GeoTrust_Primary_Certification_Authority_-_G3.pem b/secure/caroot/untrusted/GeoTrust_Primary_Certification_Authority_-_G3.pem
index 2d127e574a0e..2d127e574a0e 100644
--- a/secure/caroot/blacklisted/GeoTrust_Primary_Certification_Authority_-_G3.pem
+++ b/secure/caroot/untrusted/GeoTrust_Primary_Certification_Authority_-_G3.pem
diff --git a/secure/caroot/blacklisted/GeoTrust_Universal_CA.pem b/secure/caroot/untrusted/GeoTrust_Universal_CA.pem
index 021d3dd07b38..021d3dd07b38 100644
--- a/secure/caroot/blacklisted/GeoTrust_Universal_CA.pem
+++ b/secure/caroot/untrusted/GeoTrust_Universal_CA.pem
diff --git a/secure/caroot/blacklisted/GeoTrust_Universal_CA_2.pem b/secure/caroot/untrusted/GeoTrust_Universal_CA_2.pem
index 3ad5dfa8a1ac..3ad5dfa8a1ac 100644
--- a/secure/caroot/blacklisted/GeoTrust_Universal_CA_2.pem
+++ b/secure/caroot/untrusted/GeoTrust_Universal_CA_2.pem
diff --git a/secure/caroot/blacklisted/Global_Chambersign_Root_-_2008.pem b/secure/caroot/untrusted/Global_Chambersign_Root_-_2008.pem
index cd9bebaf8c0f..cd9bebaf8c0f 100644
--- a/secure/caroot/blacklisted/Global_Chambersign_Root_-_2008.pem
+++ b/secure/caroot/untrusted/Global_Chambersign_Root_-_2008.pem
diff --git a/secure/caroot/blacklisted/LuxTrust_Global_Root_2.pem b/secure/caroot/untrusted/LuxTrust_Global_Root_2.pem
index 9b1aa35e7037..9b1aa35e7037 100644
--- a/secure/caroot/blacklisted/LuxTrust_Global_Root_2.pem
+++ b/secure/caroot/untrusted/LuxTrust_Global_Root_2.pem
diff --git a/secure/caroot/untrusted/Makefile b/secure/caroot/untrusted/Makefile
new file mode 100644
index 000000000000..e988841071d2
--- /dev/null
+++ b/secure/caroot/untrusted/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+BINDIR=		/usr/share/certs/untrusted
+
+UNTRUSTED_CERTS!=	echo ${.CURDIR}/*.pem 2> /dev/null || true
+
+FILES+=	 ${UNTRUSTED_CERTS}
+
+.include <bsd.prog.mk>
diff --git a/secure/caroot/blacklisted/OISTE_WISeKey_Global_Root_GA_CA.pem b/secure/caroot/untrusted/OISTE_WISeKey_Global_Root_GA_CA.pem
index 08ea553a9e80..08ea553a9e80 100644
--- a/secure/caroot/blacklisted/OISTE_WISeKey_Global_Root_GA_CA.pem
+++ b/secure/caroot/untrusted/OISTE_WISeKey_Global_Root_GA_CA.pem
diff --git a/secure/caroot/blacklisted/Staat_der_Nederlanden_Root_CA_-_G2.pem b/secure/caroot/untrusted/Staat_der_Nederlanden_Root_CA_-_G2.pem
index 2f36eaed33af..2f36eaed33af 100644
--- a/secure/caroot/blacklisted/Staat_der_Nederlanden_Root_CA_-_G2.pem
+++ b/secure/caroot/untrusted/Staat_der_Nederlanden_Root_CA_-_G2.pem
diff --git a/secure/caroot/blacklisted/Staat_der_Nederlanden_Root_CA_-_G3.pem b/secure/caroot/untrusted/Staat_der_Nederlanden_Root_CA_-_G3.pem
index 14a79c4c3e24..14a79c4c3e24 100644
--- a/secure/caroot/blacklisted/Staat_der_Nederlanden_Root_CA_-_G3.pem
+++ b/secure/caroot/untrusted/Staat_der_Nederlanden_Root_CA_-_G3.pem
diff --git a/secure/caroot/blacklisted/SwissSign_Platinum_CA_-_G2.pem b/secure/caroot/untrusted/SwissSign_Platinum_CA_-_G2.pem
index f4678f629684..f4678f629684 100644
--- a/secure/caroot/blacklisted/SwissSign_Platinum_CA_-_G2.pem
+++ b/secure/caroot/untrusted/SwissSign_Platinum_CA_-_G2.pem
diff --git a/secure/caroot/blacklisted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G4.pem b/secure/caroot/untrusted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G4.pem
index ffac924e93ac..ffac924e93ac 100644
--- a/secure/caroot/blacklisted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G4.pem
+++ b/secure/caroot/untrusted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G4.pem
diff --git a/secure/caroot/blacklisted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G6.pem b/secure/caroot/untrusted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G6.pem
index 019c97a13d34..019c97a13d34 100644
--- a/secure/caroot/blacklisted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G6.pem
+++ b/secure/caroot/untrusted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G6.pem
diff --git a/secure/caroot/blacklisted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G4.pem b/secure/caroot/untrusted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G4.pem
index 97c6caf2b862..97c6caf2b862 100644
--- a/secure/caroot/blacklisted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G4.pem
+++ b/secure/caroot/untrusted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G4.pem
diff --git a/secure/caroot/blacklisted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G6.pem b/secure/caroot/untrusted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G6.pem
index df9468c1249e..df9468c1249e 100644
--- a/secure/caroot/blacklisted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G6.pem
+++ b/secure/caroot/untrusted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G6.pem
diff --git a/secure/caroot/blacklisted/Taiwan_GRCA.pem b/secure/caroot/untrusted/Taiwan_GRCA.pem
index 1d7bf6ad8ce9..1d7bf6ad8ce9 100644
--- a/secure/caroot/blacklisted/Taiwan_GRCA.pem
+++ b/secure/caroot/untrusted/Taiwan_GRCA.pem
diff --git a/secure/caroot/blacklisted/Trustis_FPS_Root_CA.pem b/secure/caroot/untrusted/Trustis_FPS_Root_CA.pem
index 476ba64dfd63..476ba64dfd63 100644
--- a/secure/caroot/blacklisted/Trustis_FPS_Root_CA.pem
+++ b/secure/caroot/untrusted/Trustis_FPS_Root_CA.pem
diff --git a/secure/caroot/blacklisted/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G4.pem b/secure/caroot/untrusted/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G4.pem
index cd10cc02f295..cd10cc02f295 100644
--- a/secure/caroot/blacklisted/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G4.pem
+++ b/secure/caroot/untrusted/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G4.pem
diff --git a/secure/caroot/blacklisted/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem b/secure/caroot/untrusted/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem
index 75bf34ee90f2..75bf34ee90f2 100644
--- a/secure/caroot/blacklisted/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem
+++ b/secure/caroot/untrusted/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem
diff --git a/secure/caroot/blacklisted/VeriSign_Universal_Root_Certification_Authority.pem b/secure/caroot/untrusted/VeriSign_Universal_Root_Certification_Authority.pem
index 353f709ad531..353f709ad531 100644
--- a/secure/caroot/blacklisted/VeriSign_Universal_Root_Certification_Authority.pem
+++ b/secure/caroot/untrusted/VeriSign_Universal_Root_Certification_Authority.pem
diff --git a/secure/caroot/blacklisted/Verisign_Class_1_Public_Primary_Certification_Authority_-_G3.pem b/secure/caroot/untrusted/Verisign_Class_1_Public_Primary_Certification_Authority_-_G3.pem
index d060de75b329..d060de75b329 100644
--- a/secure/caroot/blacklisted/Verisign_Class_1_Public_Primary_Certification_Authority_-_G3.pem
+++ b/secure/caroot/untrusted/Verisign_Class_1_Public_Primary_Certification_Authority_-_G3.pem
diff --git a/secure/caroot/blacklisted/Verisign_Class_2_Public_Primary_Certification_Authority_-_G3.pem b/secure/caroot/untrusted/Verisign_Class_2_Public_Primary_Certification_Authority_-_G3.pem
index 89400caf7eb6..89400caf7eb6 100644
--- a/secure/caroot/blacklisted/Verisign_Class_2_Public_Primary_Certification_Authority_-_G3.pem
+++ b/secure/caroot/untrusted/Verisign_Class_2_Public_Primary_Certification_Authority_-_G3.pem
diff --git a/secure/caroot/blacklisted/Verisign_Class_3_Public_Primary_Certification_Authority_-_G3.pem b/secure/caroot/untrusted/Verisign_Class_3_Public_Primary_Certification_Authority_-_G3.pem
index 823fcd0b4e9d..823fcd0b4e9d 100644
--- a/secure/caroot/blacklisted/Verisign_Class_3_Public_Primary_Certification_Authority_-_G3.pem
+++ b/secure/caroot/untrusted/Verisign_Class_3_Public_Primary_Certification_Authority_-_G3.pem
diff --git a/secure/caroot/blacklisted/thawte_Primary_Root_CA.pem b/secure/caroot/untrusted/thawte_Primary_Root_CA.pem
index 087274ba4c19..087274ba4c19 100644
--- a/secure/caroot/blacklisted/thawte_Primary_Root_CA.pem
+++ b/secure/caroot/untrusted/thawte_Primary_Root_CA.pem
diff --git a/secure/caroot/blacklisted/thawte_Primary_Root_CA_-_G2.pem b/secure/caroot/untrusted/thawte_Primary_Root_CA_-_G2.pem
index 0abe25c5f88c..0abe25c5f88c 100644
--- a/secure/caroot/blacklisted/thawte_Primary_Root_CA_-_G2.pem
+++ b/secure/caroot/untrusted/thawte_Primary_Root_CA_-_G2.pem
diff --git a/secure/caroot/blacklisted/thawte_Primary_Root_CA_-_G3.pem b/secure/caroot/untrusted/thawte_Primary_Root_CA_-_G3.pem
index c877ca070321..c877ca070321 100644
--- a/secure/caroot/blacklisted/thawte_Primary_Root_CA_-_G3.pem
+++ b/secure/caroot/untrusted/thawte_Primary_Root_CA_-_G3.pem