From 1009a41768d28e147c9939fe3f9d03a250c54e0c Mon Sep 17 00:00:00 2001
From: chengr28 <chengr28@gmail.com>
Date: Tue, 24 Feb 2015 15:57:47 +0800
Subject: [PATCH] 2015-02-24
---
README.md | 10 +-
.../RevokeChinaCerts_CodeSigning.bat | 57 --
.../RevokeChinaCerts_CodeSigning_Choice.bat | 210 -------
.../RevokeChinaCerts_CodeSigning_Restore.bat | 86 ---
.../RevokeChinaCerts_Organization.bat | 56 --
.../RevokeChinaCerts_Organization_Choice.bat | 204 -------
.../RevokeChinaCerts_Organization_Restore.bat | 84 ---
.../SoftCertPolicyAppender.exe | Bin 16384 -> 0 bytes
.../CodeSigning/91Com.crt | 0
.../BEIJING_KUWO_TECHNOLOGY_COLTD.crt | 0
..._QIYI_CENTURY_SCIENCE_TECHNOLOGY_COLTD.crt | 0
.../CodeSigning/Baidu_China_CoLtd.crt | 0
...du_Netcom_Science_And_Technology_CoLtd.crt | 0
.../Beijing_Baofeng_Technology_CoLtd.crt | 0
...ijing_Funshion_Online_Technologies_Ltd.crt | 0
...ijing_Kingsoft_Security_Software_CoLtd.crt | 0
...rmation_Technology_Corporation_Limited.crt | 0
...New_Media_Information_Technology_CoLtd.crt | 0
...ngzhou_Tieren_Network_Technology_CoLtd.crt | 0
.../CodeSigning/Kingsoft_Security_CoLtd.crt | 0
...ET_INFORMATION_TECHNOLOGY_CORP_BEIJING.crt | 0
.../CodeSigning/Maxthon_Asia_Limited.crt | 0
.../CodeSigning/MeituCom.crt | 0
.../NetEase_Hangzhou_Network_CoLtd.crt | 0
.../CodeSigning/PPLive_Corporation.crt | 0
...o_360_Software_Beijing_Company_Limited.crt | 0
...ai_Quan_Tudou_Network_Technology_CoLtd.crt | 0
...hen_Xunlei_Networking_Technologies_Ltd.crt | 0
.../TAOBAO_CHINA_SOFTWARE_COLTD.crt | 0
...nt_Technology_Shenzhen_Company_Limited.crt | 0
...nology_Shenzhen_Company_Limited_201001.crt | 0
.../CodeSigning/UC_Mobile_Limited.crt | 0
.../CodeSigning/Wandou_Technology_Ltd.crt | 0
...Signing_Authority_UTN_USERFirst_Object.crt | 0
...Signing_Authority_UTN_USERFirst_Object.crt | 0
...men_Yitianxia_Network_Technology_CoLtd.crt | 0
.../CodeSigning/XiamiCom.crt | 0
.../CodeSigning/YY_Inc.crt | 0
.../CodeSigning/YlmfCom.crt | 0
...cion_Raiz_del_Estado_Venezolano_200702.crt | 0
...cion_Raiz_del_Estado_Venezolano_201012.crt | 0
Windows/Certs/{ => Online}/CFCA_EV_ROOT.crt | 0
.../Certs/{ => Online}/CFCA_GT_CA_201106.crt | 0
.../Certs/{ => Online}/CFCA_GT_CA_201208.crt | 0
Windows/Certs/{ => Online}/CNNIC_ROOT.crt | 0
.../Certs/{ => Online}/CNNIC_SSL_Entrust.crt | 0
.../Certification_Authority_Of_WoSign.crt | 0
...rtification_Authority_Of_WoSign_200908.crt | 0
...tification_Authority_Of_WoSign_Chinese.crt | 0
...n_Authority_Of_WoSign_Chinese_StartCom.crt | 0
...on_Authority_Of_WoSign_StartCom_200609.crt | 0
..._Authority_Of_WoSign_StartCom_201103_1.crt | 0
..._Authority_Of_WoSign_StartCom_201103_2.crt | 0
...fication_Authority_Of_WoSign_USERTrust.crt | 0
...nformation_Center_EV_Certificates_Root.crt | 0
.../Certs/{ => Online}/Class_1_Primary_CA.crt | 0
Windows/Certs/{ => Online}/GiantRootCA.crt | 0
...overnment_Root_Certification_Authority.crt | 0
.../{ => Online}/Hongkong_Post_Root_CA.crt | 0
.../{ => Online}/Hongkong_Post_Root_CA_1.crt | 0
Windows/Certs/{ => Online}/JGZXCA.crt | 0
...SignTrust_Root_Certification_Authority.crt | 0
...Trust_Root_Certification_Authority_G02.crt | 0
Windows/Certs/{ => Online}/SRCA.crt | 0
Windows/Certs/{ => Online}/Superfish_Inc.crt | 0
.../{ => Online}/TWCA_Global_Root_CA.crt | 0
.../TWCA_Root_Certification_Authority_1.crt | 0
.../TWCA_Root_Certification_Authority_2.crt | 0
.../{ => Online}/TWCA_Secure_CA_Baltimore.crt | 0
...cure_Certification_Authority_USERTrust.crt | 0
.../{ => Online}/TaiCA_Secure_CA_GTE.crt | 0
.../UCA_Extended_Validation_Root.crt | 0
.../Certs/{ => Online}/UCA_Global_Root.crt | 0
.../Certs/{ => Online}/UCA_Root_200101.crt | 0
.../Certs/{ => Online}/UCA_Root_200401.crt | 0
.../WoSign_Client_Authority_USERTrust.crt | 0
...ign_Premium_Server_Authority_USERTrust.crt | 0
.../WoSign_SGC_Server_Authority_USERTrust.crt | 0
.../WoSign_Server_Authority_USERTrust.crt | 0
.../WoTrust_Client_Authority_USERTrust.crt | 0
...ust_Premium_Server_Authority_USERTrust.crt | 0
...WoTrust_SGC_Server_Authority_USERTrust.crt | 0
.../WoTrust_Server_Authority_USERTrust.crt | 0
.../[Fake]AnyHotmailCom_201501.crt | 0
.../{ => Online}/[Fake]GitHubCom_201301.crt | 0
.../{ => Online}/[Fake]GoogleCom_201407.crt | 0
.../{ => Online}/[Fake]GoogleCom_201409.crt | 0
.../{ => Online}/[Fake]HotmaiCom_201410.crt | 0
.../[Fake]WwwFacebookCom_201410.crt | 0
.../[Fake]WwwIcloudCom_201410.crt | 0
.../{ => Online}/[Fake]YahooCom_201409.crt | 0
.../{ => Online}/[Suspicious]GoAgent_CA.crt | 0
.../{ => Online}/[Suspicious]WaccBaiduCom.crt | 0
.../ePKI_Root_Certification_Authority.crt | 0
.../Organization/ABC.crt | 0
.../Organization/ABC2048.crt | 0
.../Organization/ABC_TEST_CA.crt | 0
.../Organization/ALIPAY_ROOT.crt | 0
.../AlibabaCom_Corporation_Root_CA.crt | 0
.../Organization/Alipay_Trust_NetWork.crt | 0
.../Organization/BOCOMCA.crt | 0
.../Organization/CCB_CA_ROOT_199906.crt | 0
.../Organization/CCB_CA_ROOT_200906.crt | 0
.../Organization/CFCA.crt | 0
.../Organization/CFCA_CS_CA.crt | 0
.../Organization/CFCA_CS_SM2_CA.crt | 0
.../Organization/CFCA_CS_TEST_CA.crt | 0
.../Organization/CFCA_CS_TEST_SM2_CA.crt | 0
.../Organization/CFCA_EV_SM2_ROOT.crt | 0
.../Organization/CFCA_GT_SM2_CA.crt | 0
.../Organization/CFCA_Operation_CA3.crt | 0
.../Organization/CFCA_RCA.crt | 0
.../Organization/CFCA_RSA_RCA.crt | 0
.../Organization/CFCA_Root_CA.crt | 0
.../Organization/CFCA_SM2_RCA.crt | 0
.../Organization/China_Trust_Network_1.crt | 0
.../Organization/China_Trust_Network_2.crt | 0
.../Organization/China_Trust_Network_3.crt | 0
.../Organization/ICBC.crt | 0
.../Organization/ICBC_Root_CA.crt | 0
.../Organization/IcbcCA.crt | 0
.../Organization/Personal_ICBC_CA.crt | 0
.../Organization/ROOTCA_NRCAC.crt | 0
.../Organization/ROOTCA_OSCCA.crt | 0
.../Organization/SZCA.crt | 0
.../Organization/SZCA_200307.crt | 0
.../Organization/TenpayCom_Root_CA.crt | 0
.../Organization/iTruschina_CN_Root_CA_1.crt | 0
.../Organization/iTruschina_CN_Root_CA_2.crt | 0
.../Organization/iTruschina_CN_Root_CA_3.crt | 0
Windows/RevokeChinaCerts_Base.bat | 114 ----
Windows/RevokeChinaCerts_CodeSigning.bat | 307 ++++++++++
Windows/RevokeChinaCerts_Extended.bat | 179 ------
...ts_All.bat => RevokeChinaCerts_Online.bat} | 523 +++++++++++-------
Windows/RevokeChinaCerts_Organization.bat | 298 ++++++++++
Windows/RevokeChinaCerts_Restore.bat | 147 -----
.../SoftCertPolicyAppender/LocalPolicy.dll | Bin
.../SoftCertPolicyAppender.exe | Bin 0 -> 15872 bytes
.../SoftCertPolicyAppender/Source/.gitignore | 182 ++++++
.../SoftCertPolicyAppender/Source/README.md | 20 +
.../Source/SoftCertPolicyAppender.sln | 0
.../CertPolicyAppender.cs | 0
.../Source/SoftCertPolicyAppender/Program.cs | 17 +-
.../Properties/AssemblyInfo.cs | 2 +-
.../SoftCertPolicyAppender.csproj | 2 +
.../Source/SoftCertPolicyAppender/app.config | 3 +
.../SoftCertPolicyAppender/app.manifest | 0
.../Source/_libs/LocalPolicy.dll | Bin 0 -> 15360 bytes
.../Source/_libs/LocalPolicy.pdb | Bin
149 files changed, 1137 insertions(+), 1364 deletions(-)
delete mode 100644 Windows/ArchiveCerts/RevokeChinaCerts_CodeSigning.bat
delete mode 100644 Windows/ArchiveCerts/RevokeChinaCerts_CodeSigning_Choice.bat
delete mode 100644 Windows/ArchiveCerts/RevokeChinaCerts_CodeSigning_Restore.bat
delete mode 100644 Windows/ArchiveCerts/RevokeChinaCerts_Organization.bat
delete mode 100644 Windows/ArchiveCerts/RevokeChinaCerts_Organization_Choice.bat
delete mode 100644 Windows/ArchiveCerts/RevokeChinaCerts_Organization_Restore.bat
delete mode 100644 Windows/ArchiveCerts/SoftCertPolicyAppender/SoftCertPolicyAppender.exe
rename Windows/{ArchiveCerts => Certs}/CodeSigning/91Com.crt (100%)
rename Windows/{ArchiveCerts => Certs}/CodeSigning/BEIJING_KUWO_TECHNOLOGY_COLTD.crt (100%)
rename Windows/{ArchiveCerts => Certs}/CodeSigning/BEIJING_QIYI_CENTURY_SCIENCE_TECHNOLOGY_COLTD.crt (100%)
rename Windows/{ArchiveCerts => Certs}/CodeSigning/Baidu_China_CoLtd.crt (100%)
rename Windows/{ArchiveCerts => Certs}/CodeSigning/Beijing_Baidu_Netcom_Science_And_Technology_CoLtd.crt (100%)
rename Windows/{ArchiveCerts => Certs}/CodeSigning/Beijing_Baofeng_Technology_CoLtd.crt (100%)
rename Windows/{ArchiveCerts => Certs}/CodeSigning/Beijing_Funshion_Online_Technologies_Ltd.crt (100%)
rename Windows/{ArchiveCerts => Certs}/CodeSigning/Beijing_Kingsoft_Security_Software_CoLtd.crt (100%)
rename Windows/{ArchiveCerts => Certs}/CodeSigning/Beijing_Rising_Information_Technology_Corporation_Limited.crt (100%)
rename Windows/{ArchiveCerts => Certs}/CodeSigning/Beijing_Sohu_New_Media_Information_Technology_CoLtd.crt (100%)
rename Windows/{ArchiveCerts => Certs}/CodeSigning/Guangzhou_Tieren_Network_Technology_CoLtd.crt (100%)
rename Windows/{ArchiveCerts => Certs}/CodeSigning/Kingsoft_Security_CoLtd.crt (100%)
rename Windows/{ArchiveCerts => Certs}/CodeSigning/LE_SHI_INTERNET_INFORMATION_TECHNOLOGY_CORP_BEIJING.crt (100%)
rename Windows/{ArchiveCerts => Certs}/CodeSigning/Maxthon_Asia_Limited.crt (100%)
rename Windows/{ArchiveCerts => Certs}/CodeSigning/MeituCom.crt (100%)
rename Windows/{ArchiveCerts => Certs}/CodeSigning/NetEase_Hangzhou_Network_CoLtd.crt (100%)
rename Windows/{ArchiveCerts => Certs}/CodeSigning/PPLive_Corporation.crt (100%)
rename Windows/{ArchiveCerts => Certs}/CodeSigning/Qihoo_360_Software_Beijing_Company_Limited.crt (100%)
rename Windows/{ArchiveCerts => Certs}/CodeSigning/Shanghai_Quan_Tudou_Network_Technology_CoLtd.crt (100%)
rename Windows/{ArchiveCerts => Certs}/CodeSigning/ShenZhen_Xunlei_Networking_Technologies_Ltd.crt (100%)
rename Windows/{ArchiveCerts => Certs}/CodeSigning/TAOBAO_CHINA_SOFTWARE_COLTD.crt (100%)
rename Windows/{ArchiveCerts => Certs}/CodeSigning/Tencent_Technology_Shenzhen_Company_Limited.crt (100%)
rename Windows/{ArchiveCerts => Certs}/CodeSigning/Tencent_Technology_Shenzhen_Company_Limited_201001.crt (100%)
rename Windows/{ArchiveCerts => Certs}/CodeSigning/UC_Mobile_Limited.crt (100%)
rename Windows/{ArchiveCerts => Certs}/CodeSigning/Wandou_Technology_Ltd.crt (100%)
rename Windows/{ArchiveCerts => Certs}/CodeSigning/WoSign_Code_Signing_Authority_UTN_USERFirst_Object.crt (100%)
rename Windows/{ArchiveCerts => Certs}/CodeSigning/WoTrust_Code_Signing_Authority_UTN_USERFirst_Object.crt (100%)
rename Windows/{ArchiveCerts => Certs}/CodeSigning/Xiamen_Yitianxia_Network_Technology_CoLtd.crt (100%)
rename Windows/{ArchiveCerts => Certs}/CodeSigning/XiamiCom.crt (100%)
rename Windows/{ArchiveCerts => Certs}/CodeSigning/YY_Inc.crt (100%)
rename Windows/{ArchiveCerts => Certs}/CodeSigning/YlmfCom.crt (100%)
rename Windows/{ArchiveCerts/Organization => Certs/Online}/Autoridad_de_Certificacion_Raiz_del_Estado_Venezolano_200702.crt (100%)
rename Windows/{ArchiveCerts/Organization => Certs/Online}/Autoridad_de_Certificacion_Raiz_del_Estado_Venezolano_201012.crt (100%)
rename Windows/Certs/{ => Online}/CFCA_EV_ROOT.crt (100%)
rename Windows/Certs/{ => Online}/CFCA_GT_CA_201106.crt (100%)
rename Windows/Certs/{ => Online}/CFCA_GT_CA_201208.crt (100%)
rename Windows/Certs/{ => Online}/CNNIC_ROOT.crt (100%)
rename Windows/Certs/{ => Online}/CNNIC_SSL_Entrust.crt (100%)
rename Windows/Certs/{ => Online}/Certification_Authority_Of_WoSign.crt (100%)
rename Windows/Certs/{ => Online}/Certification_Authority_Of_WoSign_200908.crt (100%)
rename Windows/Certs/{ => Online}/Certification_Authority_Of_WoSign_Chinese.crt (100%)
rename Windows/Certs/{ => Online}/Certification_Authority_Of_WoSign_Chinese_StartCom.crt (100%)
rename Windows/Certs/{ => Online}/Certification_Authority_Of_WoSign_StartCom_200609.crt (100%)
rename Windows/Certs/{ => Online}/Certification_Authority_Of_WoSign_StartCom_201103_1.crt (100%)
rename Windows/Certs/{ => Online}/Certification_Authority_Of_WoSign_StartCom_201103_2.crt (100%)
rename Windows/Certs/{ => Online}/Certification_Authority_Of_WoSign_USERTrust.crt (100%)
rename Windows/Certs/{ => Online}/China_Internet_Network_Information_Center_EV_Certificates_Root.crt (100%)
rename Windows/Certs/{ => Online}/Class_1_Primary_CA.crt (100%)
rename Windows/Certs/{ => Online}/GiantRootCA.crt (100%)
rename Windows/Certs/{ => Online}/Government_Root_Certification_Authority.crt (100%)
rename Windows/Certs/{ => Online}/Hongkong_Post_Root_CA.crt (100%)
rename Windows/Certs/{ => Online}/Hongkong_Post_Root_CA_1.crt (100%)
rename Windows/Certs/{ => Online}/JGZXCA.crt (100%)
rename Windows/Certs/{ => Online}/Macao_Post_eSignTrust_Root_Certification_Authority.crt (100%)
rename Windows/Certs/{ => Online}/Macao_Post_eSignTrust_Root_Certification_Authority_G02.crt (100%)
rename Windows/Certs/{ => Online}/SRCA.crt (100%)
rename Windows/Certs/{ => Online}/Superfish_Inc.crt (100%)
rename Windows/Certs/{ => Online}/TWCA_Global_Root_CA.crt (100%)
rename Windows/Certs/{ => Online}/TWCA_Root_Certification_Authority_1.crt (100%)
rename Windows/Certs/{ => Online}/TWCA_Root_Certification_Authority_2.crt (100%)
rename Windows/Certs/{ => Online}/TWCA_Secure_CA_Baltimore.crt (100%)
rename Windows/Certs/{ => Online}/TWCA_Secure_Certification_Authority_USERTrust.crt (100%)
rename Windows/Certs/{ => Online}/TaiCA_Secure_CA_GTE.crt (100%)
rename Windows/Certs/{ => Online}/UCA_Extended_Validation_Root.crt (100%)
rename Windows/Certs/{ => Online}/UCA_Global_Root.crt (100%)
rename Windows/Certs/{ => Online}/UCA_Root_200101.crt (100%)
rename Windows/Certs/{ => Online}/UCA_Root_200401.crt (100%)
rename Windows/Certs/{ => Online}/WoSign_Client_Authority_USERTrust.crt (100%)
rename Windows/Certs/{ => Online}/WoSign_Premium_Server_Authority_USERTrust.crt (100%)
rename Windows/Certs/{ => Online}/WoSign_SGC_Server_Authority_USERTrust.crt (100%)
rename Windows/Certs/{ => Online}/WoSign_Server_Authority_USERTrust.crt (100%)
rename Windows/Certs/{ => Online}/WoTrust_Client_Authority_USERTrust.crt (100%)
rename Windows/Certs/{ => Online}/WoTrust_Premium_Server_Authority_USERTrust.crt (100%)
rename Windows/Certs/{ => Online}/WoTrust_SGC_Server_Authority_USERTrust.crt (100%)
rename Windows/Certs/{ => Online}/WoTrust_Server_Authority_USERTrust.crt (100%)
rename Windows/Certs/{ => Online}/[Fake]AnyHotmailCom_201501.crt (100%)
rename Windows/Certs/{ => Online}/[Fake]GitHubCom_201301.crt (100%)
rename Windows/Certs/{ => Online}/[Fake]GoogleCom_201407.crt (100%)
rename Windows/Certs/{ => Online}/[Fake]GoogleCom_201409.crt (100%)
rename Windows/Certs/{ => Online}/[Fake]HotmaiCom_201410.crt (100%)
rename Windows/Certs/{ => Online}/[Fake]WwwFacebookCom_201410.crt (100%)
rename Windows/Certs/{ => Online}/[Fake]WwwIcloudCom_201410.crt (100%)
rename Windows/Certs/{ => Online}/[Fake]YahooCom_201409.crt (100%)
rename Windows/Certs/{ => Online}/[Suspicious]GoAgent_CA.crt (100%)
rename Windows/Certs/{ => Online}/[Suspicious]WaccBaiduCom.crt (100%)
rename Windows/Certs/{ => Online}/ePKI_Root_Certification_Authority.crt (100%)
rename Windows/{ArchiveCerts => Certs}/Organization/ABC.crt (100%)
rename Windows/{ArchiveCerts => Certs}/Organization/ABC2048.crt (100%)
rename Windows/{ArchiveCerts => Certs}/Organization/ABC_TEST_CA.crt (100%)
rename Windows/{ArchiveCerts => Certs}/Organization/ALIPAY_ROOT.crt (100%)
rename Windows/{ArchiveCerts => Certs}/Organization/AlibabaCom_Corporation_Root_CA.crt (100%)
rename Windows/{ArchiveCerts => Certs}/Organization/Alipay_Trust_NetWork.crt (100%)
rename Windows/{ArchiveCerts => Certs}/Organization/BOCOMCA.crt (100%)
rename Windows/{ArchiveCerts => Certs}/Organization/CCB_CA_ROOT_199906.crt (100%)
rename Windows/{ArchiveCerts => Certs}/Organization/CCB_CA_ROOT_200906.crt (100%)
rename Windows/{ArchiveCerts => Certs}/Organization/CFCA.crt (100%)
rename Windows/{ArchiveCerts => Certs}/Organization/CFCA_CS_CA.crt (100%)
rename Windows/{ArchiveCerts => Certs}/Organization/CFCA_CS_SM2_CA.crt (100%)
rename Windows/{ArchiveCerts => Certs}/Organization/CFCA_CS_TEST_CA.crt (100%)
rename Windows/{ArchiveCerts => Certs}/Organization/CFCA_CS_TEST_SM2_CA.crt (100%)
rename Windows/{ArchiveCerts => Certs}/Organization/CFCA_EV_SM2_ROOT.crt (100%)
rename Windows/{ArchiveCerts => Certs}/Organization/CFCA_GT_SM2_CA.crt (100%)
rename Windows/{ArchiveCerts => Certs}/Organization/CFCA_Operation_CA3.crt (100%)
rename Windows/{ArchiveCerts => Certs}/Organization/CFCA_RCA.crt (100%)
rename Windows/{ArchiveCerts => Certs}/Organization/CFCA_RSA_RCA.crt (100%)
rename Windows/{ArchiveCerts => Certs}/Organization/CFCA_Root_CA.crt (100%)
rename Windows/{ArchiveCerts => Certs}/Organization/CFCA_SM2_RCA.crt (100%)
rename Windows/{ArchiveCerts => Certs}/Organization/China_Trust_Network_1.crt (100%)
rename Windows/{ArchiveCerts => Certs}/Organization/China_Trust_Network_2.crt (100%)
rename Windows/{ArchiveCerts => Certs}/Organization/China_Trust_Network_3.crt (100%)
rename Windows/{ArchiveCerts => Certs}/Organization/ICBC.crt (100%)
rename Windows/{ArchiveCerts => Certs}/Organization/ICBC_Root_CA.crt (100%)
rename Windows/{ArchiveCerts => Certs}/Organization/IcbcCA.crt (100%)
rename Windows/{ArchiveCerts => Certs}/Organization/Personal_ICBC_CA.crt (100%)
rename Windows/{ArchiveCerts => Certs}/Organization/ROOTCA_NRCAC.crt (100%)
rename Windows/{ArchiveCerts => Certs}/Organization/ROOTCA_OSCCA.crt (100%)
rename Windows/{ArchiveCerts => Certs}/Organization/SZCA.crt (100%)
rename Windows/{ArchiveCerts => Certs}/Organization/SZCA_200307.crt (100%)
rename Windows/{ArchiveCerts => Certs}/Organization/TenpayCom_Root_CA.crt (100%)
rename Windows/{ArchiveCerts => Certs}/Organization/iTruschina_CN_Root_CA_1.crt (100%)
rename Windows/{ArchiveCerts => Certs}/Organization/iTruschina_CN_Root_CA_2.crt (100%)
rename Windows/{ArchiveCerts => Certs}/Organization/iTruschina_CN_Root_CA_3.crt (100%)
delete mode 100644 Windows/RevokeChinaCerts_Base.bat
create mode 100644 Windows/RevokeChinaCerts_CodeSigning.bat
delete mode 100644 Windows/RevokeChinaCerts_Extended.bat
rename Windows/{RevokeChinaCerts_All.bat => RevokeChinaCerts_Online.bat} (62%)
create mode 100644 Windows/RevokeChinaCerts_Organization.bat
delete mode 100644 Windows/RevokeChinaCerts_Restore.bat
rename Windows/{ArchiveCerts => Tools}/SoftCertPolicyAppender/LocalPolicy.dll (100%)
create mode 100644 Windows/Tools/SoftCertPolicyAppender/SoftCertPolicyAppender.exe
create mode 100644 Windows/Tools/SoftCertPolicyAppender/Source/.gitignore
create mode 100644 Windows/Tools/SoftCertPolicyAppender/Source/README.md
rename Windows/{ArchiveCerts => Tools}/SoftCertPolicyAppender/Source/SoftCertPolicyAppender.sln (100%)
rename Windows/{ArchiveCerts => Tools}/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/CertPolicyAppender.cs (100%)
rename Windows/{ArchiveCerts => Tools}/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/Program.cs (85%)
rename Windows/{ArchiveCerts => Tools}/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/Properties/AssemblyInfo.cs (95%)
rename Windows/{ArchiveCerts => Tools}/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/SoftCertPolicyAppender.csproj (96%)
create mode 100644 Windows/Tools/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/app.config
rename Windows/{ArchiveCerts => Tools}/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/app.manifest (100%)
create mode 100644 Windows/Tools/SoftCertPolicyAppender/Source/_libs/LocalPolicy.dll
rename Windows/{ArchiveCerts => Tools}/SoftCertPolicyAppender/Source/_libs/LocalPolicy.pdb (100%)
diff --git a/README.md b/README.md
index eed67f9..d981974 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ Revoke China Certificates.<br />
全自动å¯ç–‘è¯ä¹¦åŠé”€å·¥å…·/全自動å¯ç–‘憑è‰æ’¤éŠ·å·¥å…·<br />
### Updated
-**2015-02-20**
+**2015-02-24**
### Type
* Online Certificates/在线è¯ä¹¦/在線è‰æ›¸
@@ -35,9 +35,13 @@ Revoke China Certificates.<br />
* [简体ä¸æ–‡](https://github.com/chengr28/RevokeChinaCerts/wiki/ReadMe_Organization(Chinese_Simplified))
* [ç¹é«”ä¸æ–‡](https://github.com/chengr28/RevokeChinaCerts/wiki/ReadMe_Organization(Chinese_Traditional))
+### Contributors
+* [Script to automatically disable for Mac OS X](https://github.com/QuantumGhost/RevokeChinaCerts/tree/master/Mac)
+* [SoftCertPolicyAppender](https://github.com/lhyqy5/RevokeChinaCerts/tree/master/Windows/SoftCertPolicyAppender)
+* [Android version of automated tools](https://github.com/phoeagon/RevokeChinaCerts/tree/master/Android)
+
### Thanks
-* [拉黑è¯ä¹¦ è®©ä½ çš„ç”µè„‘å†ä¹Ÿè£…ä¸ä¸ŠæŸäº›è½¯ä»¶ 附è¯ä¹¦å¤§å…¨](http://blog.eqoe.cn/posts/ban-digital-cert.html)
* [BlockChinaSoftware](https://github.com/SCFWSE/BlockChinaSoftware)
* [UTLS-Blocker](https://github.com/SCFWSE/UTLS-Blocker)
+* [拉黑è¯ä¹¦ è®©ä½ çš„ç”µè„‘å†ä¹Ÿè£…ä¸ä¸ŠæŸäº›è½¯ä»¶ 附è¯ä¹¦å¤§å…¨](http://blog.eqoe.cn/posts/ban-digital-cert.html)
* [Local-Policy](https://bitbucket.org/MartinEden/local-policy/overview)
-* [SoftCertPolicyAppender](https://github.com/lhyqy5/RevokeChinaCerts/tree/master/Windows/SoftCertPolicyAppender)
diff --git a/Windows/ArchiveCerts/RevokeChinaCerts_CodeSigning.bat b/Windows/ArchiveCerts/RevokeChinaCerts_CodeSigning.bat
deleted file mode 100644
index 383cda6..0000000
--- a/Windows/ArchiveCerts/RevokeChinaCerts_CodeSigning.bat
+++ /dev/null
@@ -1,57 +0,0 @@
-:: RevokeChinaCerts CodeSigning batch
-:: Revoke China Certificates.
-::
-:: Author: Chengr28
-::
-
-@echo off
-
-:: Folder location
-cd /d %~dp0
-cd..
-set Folder=%cd%
-
-:: Architecture check
-set CertMgr="%Folder%\Tools\CertMgr"
-if "%PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432%" == "x86" set CertMgr="%Folder%\Tools\CertMgr_x86"
-
-:: Add certificates to CRL
-set Folder=%Folder%\ArchiveCerts\CodeSigning
-%CertMgr% -add -c "%Folder%\WoSign_Code_Signing_Authority_UTN_USERFirst_Object.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\WoTrust_Code_Signing_Authority_UTN_USERFirst_Object.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\91Com.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\Baidu_China_CoLtd.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\Beijing_Baidu_Netcom_Science_And_Technology_CoLtd.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\Beijing_Baofeng_Technology_CoLtd.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\Beijing_Funshion_Online_Technologies_Ltd.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\Beijing_Kingsoft_Security_Software_CoLtd.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\BEIJING_KUWO_TECHNOLOGY_COLTD.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\BEIJING_QIYI_CENTURY_SCIENCE_TECHNOLOGY_COLTD.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\Beijing_Rising_Information_Technology_Corporation_Limited.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\Beijing_Sohu_New_Media_Information_Technology_CoLtd.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\Guangzhou_Tieren_Network_Technology_CoLtd.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\Kingsoft_Security_CoLtd.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\LE_SHI_INTERNET_INFORMATION_TECHNOLOGY_CORP_BEIJING.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\Maxthon_Asia_Limited.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\MeituCom.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\NetEase_Hangzhou_Network_CoLtd.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\PPLive_Corporation.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\Qihoo_360_Software_Beijing_Company_Limited.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\Shanghai_Quan_Tudou_Network_Technology_CoLtd.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\ShenZhen_Xunlei_Networking_Technologies_Ltd.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\TAOBAO_CHINA_SOFTWARE_COLTD.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\Tencent_Technology_Shenzhen_Company_Limited.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\Tencent_Technology_Shenzhen_Company_Limited_201001.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\UC_Mobile_Limited.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\Wandou_Technology_Ltd.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\Xiamen_Yitianxia_Network_Technology_CoLtd.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\XiamiCom.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\YlmfCom.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\YY_Inc.crt" -s Disallowed
-
-:: Print to screen.
-@echo.
-@echo RevokeChinaCerts CodeSigning version
-@echo Done. Please confirm the messages on screen.
-@echo.
-@pause
diff --git a/Windows/ArchiveCerts/RevokeChinaCerts_CodeSigning_Choice.bat b/Windows/ArchiveCerts/RevokeChinaCerts_CodeSigning_Choice.bat
deleted file mode 100644
index 3a8fb68..0000000
--- a/Windows/ArchiveCerts/RevokeChinaCerts_CodeSigning_Choice.bat
+++ /dev/null
@@ -1,210 +0,0 @@
-:: RevokeChinaCerts CodeSigning Choice batch
-:: Revoke China Certificates.
-::
-:: Author: Chengr28
-::
-
-@echo off
-
-:: Folder location
-cd /d %~dp0
-cd..
-set Folder=%cd%
-
-:: Architecture check
-set CertMgr="%Folder%\Tools\CertMgr"
-if "%PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432%" == "x86" set CertMgr="%Folder%\Tools\CertMgr_x86"
-
-:: Add certificates to CRL
-set Folder=%Folder%\ArchiveCerts\CodeSigning
-set /p UserChoice="Revoke WoSign Code Signing Authority(UTN-USERFirst-Object)? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-1
-%CertMgr% -add -c "%Folder%\WoSign_Code_Signing_Authority_UTN_USERFirst_Object.crt" -s Disallowed
-
-:CERT-1
-@echo.
-set /p UserChoice="Revoke WoTrust Code Signing Authority(UTN-USERFirst-Object)? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-2
-%CertMgr% -add -c "%Folder%\WoTrust_Code_Signing_Authority_UTN_USERFirst_Object.crt" -s Disallowed
-
-:CERT-2
-@echo.
-set /p UserChoice="Revoke 91.Com? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-3
-%CertMgr% -add -c "%Folder%\91Com.crt" -s Disallowed
-
-:CERT-3
-@echo.
-set /p UserChoice="Revoke Baidu (China) Co., Ltd.? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-4
-%CertMgr% -add -c "%Folder%\Baidu_China_CoLtd.crt" -s Disallowed
-
-:CERT-4
-@echo.
-set /p UserChoice="Revoke Beijing baidu Netcom science and technology co.ltd? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-5
-%CertMgr% -add -c "%Folder%\Beijing_Baidu_Netcom_Science_And_Technology_CoLtd.crt" -s Disallowed
-
-:CERT-5
-@echo.
-set /p UserChoice="Revoke Beijing Baofeng Technology Co., Ltd.? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-6
-%CertMgr% -add -c "%Folder%\Beijing_Baofeng_Technology_CoLtd.crt" -s Disallowed
-
-:CERT-6
-@echo.
-set /p UserChoice="Revoke Beijing Funshion Online Technologies Ltd.? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-7
-%CertMgr% -add -c "%Folder%\Beijing_Funshion_Online_Technologies_Ltd.crt" -s Disallowed
-
-:CERT-7
-@echo.
-set /p UserChoice="Revoke Beijing Kingsoft Security software Co.,Ltd? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-8
-%CertMgr% -add -c "%Folder%\Beijing_Kingsoft_Security_Software_CoLtd.crt" -s Disallowed
-
-:CERT-8
-@echo.
-set /p UserChoice="Revoke BEIJING KUWO TECHNOLOGY CO.,LTD.? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-9
-%CertMgr% -add -c "%Folder%\BEIJING_KUWO_TECHNOLOGY_COLTD.crt" -s Disallowed
-
-:CERT-9
-@echo.
-set /p UserChoice="Revoke BEIJING QIYI CENTURY SCIENCE&TECHNOLOGY CO.,LTD.? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-10
-%CertMgr% -add -c "%Folder%\BEIJING_QIYI_CENTURY_SCIENCE_TECHNOLOGY_COLTD.crt" -s Disallowed
-
-:CERT-10
-@echo.
-set /p UserChoice="Revoke Beijing Rising Information Technology Corporation Limited? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-11
-%CertMgr% -add -c "%Folder%\Beijing_Rising_Information_Technology_Corporation_Limited.crt" -s Disallowed
-
-:CERT-11
-@echo.
-set /p UserChoice="Revoke Beijing Sohu New Media Information Technology Co., Ltd.? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-12
-%CertMgr% -add -c "%Folder%\Beijing_Sohu_New_Media_Information_Technology_CoLtd.crt" -s Disallowed
-
-:CERT-12
-@echo.
-set /p UserChoice="Revoke Guangzhou Tieren Network Technology Co.,Ltd.? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-13
-%CertMgr% -add -c "%Folder%\Guangzhou_Tieren_Network_Technology_CoLtd.crt" -s Disallowed
-
-:CERT-13
-@echo.
-set /p UserChoice="Revoke Kingsoft Security Co.,Ltd? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-14
-%CertMgr% -add -c "%Folder%\Kingsoft_Security_CoLtd.crt" -s Disallowed
-
-:CERT-14
-@echo.
-set /p UserChoice="Revoke LE SHI INTERNET INFORMATION TECHNOLOGY CORP.,BEI JING? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-15
-%CertMgr% -add -c "%Folder%\LE_SHI_INTERNET_INFORMATION_TECHNOLOGY_CORP_BEIJING.crt" -s Disallowed
-
-:CERT-15
-@echo.
-set /p UserChoice="Revoke Maxthon (Asia) Limited? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-16
-%CertMgr% -add -c "%Folder%\Maxthon_Asia_Limited.crt" -s Disallowed
-
-:CERT-16
-@echo.
-set /p UserChoice="Revoke Meitu.Com? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-17
-%CertMgr% -add -c "%Folder%\MeituCom.crt" -s Disallowed
-
-:CERT-17
-@echo.
-set /p UserChoice="Revoke NetEase(Hangzhou) Network Co. Ltd.? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-18
-%CertMgr% -add -c "%Folder%\NetEase_Hangzhou_Network_CoLtd.crt" -s Disallowed
-
-:CERT-18
-@echo.
-set /p UserChoice="Revoke PPLive Corporation? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-19
-%CertMgr% -add -c "%Folder%\PPLive_Corporation.crt" -s Disallowed
-
-:CERT-19
-@echo.
-set /p UserChoice="Revoke Qihoo 360 Software Beijing Company Limited? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-20
-%CertMgr% -add -c "%Folder%\Qihoo_360_Software_Beijing_Company_Limited.crt" -s Disallowed
-
-:CERT-20
-@echo.
-set /p UserChoice="Revoke Shanghai Quan Tudou Network Technology Co., Ltd.? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-21
-%CertMgr% -add -c "%Folder%\Shanghai_Quan_Tudou_Network_Technology_CoLtd.crt" -s Disallowed
-
-:CERT-21
-@echo.
-set /p UserChoice="Revoke ShenZhen Xunlei Networking Technologies Ltd.? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-22
-%CertMgr% -add -c "%Folder%\ShenZhen_Xunlei_Networking_Technologies_Ltd.crt" -s Disallowed
-
-:CERT-22
-@echo.
-set /p UserChoice="Revoke TAOBAO (CHINA) SOFTWARE CO.,LTD.? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-23
-%CertMgr% -add -c "%Folder%\TAOBAO_CHINA_SOFTWARE_COLTD.crt" -s Disallowed
-
-:CERT-23
-@echo.
-set /p UserChoice="Revoke Tencent Technology Shenzhen Company Limited? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-24
-%CertMgr% -add -c "%Folder%\Tencent_Technology_Shenzhen_Company_Limited.crt" -s Disallowed
-
-:CERT-24
-@echo.
-set /p UserChoice="Revoke Tencent Technology Shenzhen Company Limited(2010-01-26)? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-25
-%CertMgr% -add -c "%Folder%\Tencent_Technology_Shenzhen_Company_Limited_201001.crt" -s Disallowed
-
-:CERT-25
-@echo.
-set /p UserChoice="Revoke UC Mobile Limited? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-26
-%CertMgr% -add -c "%Folder%\UC_Mobile_Limited.crt" -s Disallowed
-
-:CERT-26
-@echo.
-set /p UserChoice="Revoke Wandou Technology Ltd? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-27
-%CertMgr% -add -c "%Folder%\Wandou_Technology_Ltd.crt" -s Disallowed
-
-:CERT-27
-@echo.
-set /p UserChoice="Revoke Xiamen Yitianxia Network Technology Co., Ltd? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-28
-%CertMgr% -add -c "%Folder%\Xiamen_Yitianxia_Network_Technology_CoLtd.crt" -s Disallowed
-
-:CERT-28
-@echo.
-set /p UserChoice="Revoke Xiami.Com? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-29
-%CertMgr% -add -c "%Folder%\XiamiCom.crt" -s Disallowed
-
-:CERT-29
-@echo.
-set /p UserChoice="Revoke Ylmf.Com? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-30
-%CertMgr% -add -c "%Folder%\YlmfCom.crt" -s Disallowed
-
-:CERT-30
-@echo.
-set /p UserChoice="Revoke YY Inc? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto Exit
-%CertMgr% -add -c "%Folder%\YY_Inc.crt" -s Disallowed
-
-:: Print to screen.
-:Exit
-@echo.
-@echo RevokeChinaCerts CodeSigning Choice version
-@echo Done. Please confirm the messages on screen.
-@echo.
-@pause
diff --git a/Windows/ArchiveCerts/RevokeChinaCerts_CodeSigning_Restore.bat b/Windows/ArchiveCerts/RevokeChinaCerts_CodeSigning_Restore.bat
deleted file mode 100644
index 17e25de..0000000
--- a/Windows/ArchiveCerts/RevokeChinaCerts_CodeSigning_Restore.bat
+++ /dev/null
@@ -1,86 +0,0 @@
-:: RevokeChinaCerts CodeSigning Restore batch
-:: Revoke China Certificates.
-::
-:: Author: Chengr28
-::
-
-@echo off
-
-:: Folder location
-cd /d %~dp0
-cd..
-
-:: Architecture check
-set CertMgr="%cd%\Tools\CertMgr"
-if "%PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432%" == "x86" set CertMgr="%cd%\Tools\CertMgr_x86"
-
-:: Restore certificates
-:: WoSign Code Signing Authority(UTN-USERFirst-Object)
-%CertMgr% -del -c -sha1 EA36152981E296F9763E1DC74B3262D3928563F8 -s Disallowed
-:: WoTrust Code Signing Authority(UTN-USERFirst-Object)
-%CertMgr% -del -c -sha1 B28CCC46D234A7D7CF7F21CCB9406F48A5273CC6 -s Disallowed
-:: 91.Com
-%CertMgr% -del -c -sha1 E87D1C1D3FE2BCA700EB7B8DC0E45B97EAF19405 -s Disallowed
-:: Baidu (China) Co., Ltd.
-%CertMgr% -del -c -sha1 A34B70840C2B6F718877DDB1C2DE2C27F2C91C43 -s Disallowed
-:: Beijing baidu Netcom science and technology co.ltd
-%CertMgr% -del -c -sha1 D60C12D1FDB9E45551A00C8815CCD486C043945B -s Disallowed
-:: Beijing Baofeng Technology Co., Ltd.
-%CertMgr% -del -c -sha1 CB6F65314E5B25D61304AB2C9C8870B574CC21F5 -s Disallowed
-:: Beijing Funshion Online Technologies Ltd.
-%CertMgr% -del -c -sha1 9AB5445104C6CCE5A22431CF29C4331CBC328A1B -s Disallowed
-:: Beijing Kingsoft Security software Co.,Ltd
-%CertMgr% -del -c -sha1 E88DD1ACD2DB3A352072AA49C675F4944A3FEF82 -s Disallowed
-:: BEIJING KUWO TECHNOLOGY CO.,LTD.
-%CertMgr% -del -c -sha1 5FFFD1A3EAE5ED74558913C4A8476D1514C6D61F -s Disallowed
-:: BEIJING QIYI CENTURY SCIENCE&TECHNOLOGY CO.,LTD.
-%CertMgr% -del -c -sha1 5DC57AF121E3101F4BFEA8A22BBDADC0869C80EE -s Disallowed
-:: Beijing Rising Information Technology Corporation Limited
-%CertMgr% -del -c -sha1 D9421BEDD9F5B8A91DD3F8691E7A42D83C983325 -s Disallowed
-:: Beijing Sohu New Media Information Technology Co., Ltd.
-%CertMgr% -del -c -sha1 D1BB252CAC3D250C55978F7EAAF121DA91A17B42 -s Disallowed
-:: Guangzhou Tieren Network Technology Co.,Ltd.
-%CertMgr% -del -c -sha1 2529C0C0D833806AFBFA3C31987C19A18722A2FE -s Disallowed
-:: Kingsoft Security Co.,Ltd
-%CertMgr% -del -c -sha1 2BDEC50B4446652C126709A08248E572B859CCCC -s Disallowed
-:: LE SHI INTERNET INFORMATION TECHNOLOGY CORP.,BEI JING
-%CertMgr% -del -c -sha1 62DF2BC4B5902B52C215C697D06038E3B28CF5D3 -s Disallowed
-:: Maxthon (Asia) Limited
-%CertMgr% -del -c -sha1 1481414E8E87412A00D3341167FE3A92C681B830 -s Disallowed
-:: Meitu.Com
-%CertMgr% -del -c -sha1 7B6FAE77BD19FEC5410293344B36124774A6D8F1 -s Disallowed
-:: NetEase(Hangzhou) Network Co. Ltd.
-%CertMgr% -del -c -sha1 E0387F3AF5752A4620EC617C39153C0E666CF5F8 -s Disallowed
-:: PPLive Corporation
-%CertMgr% -del -c -sha1 5477E38783CD37B1E5729B15D7C0873A2D72DB9D -s Disallowed
-:: Qihoo 360 Software Beijing Company Limited
-%CertMgr% -del -c -sha1 1E5BB77FCB63F26277F95AAE09B852699327A08A -s Disallowed
-:: Shanghai Quan Tudou Network Technology Co., Ltd.
-%CertMgr% -del -c -sha1 935140881F50BDF775D3CEF034C0D21C18FD2567 -s Disallowed
-:: ShenZhen Xunlei Networking Technologies Ltd.
-%CertMgr% -del -c -sha1 4099665730474153EADF671B8B475C03C08A46D0 -s Disallowed
-:: TAOBAO (CHINA) SOFTWARE CO.,LTD.
-%CertMgr% -del -c -sha1 E5777A69CAFD7F7C6F89C5297DD1159C7AE9B881 -s Disallowed
-:: Tencent Technology Shenzhen Company Limited
-%CertMgr% -del -c -sha1 2FDD445591CD2EEDBEF8B8A281896A59C08B3DC9 -s Disallowed
-:: Tencent Technology Shenzhen Company Limited(2010-01-26)
-%CertMgr% -del -c -sha1 8B46390D86B891E5A3D3AAB2B00D6FDB27A0F791 -s Disallowed
-:: UC Mobile Limited
-%CertMgr% -del -c -sha1 1540C77B5D19FC5A71A04DB001488E55B45DDC7F -s Disallowed
-:: Wandou Technology Ltd
-%CertMgr% -del -c -sha1 AB09D1AFE555CFC580575F5BC78B16B9F1C4E432 -s Disallowed
-:: Xiamen Yitianxia Network Technology Co., Ltd
-%CertMgr% -del -c -sha1 F49A648C69C2F01A0FDEB3992C5AE0A14D5AD9FC -s Disallowed
-:: Xiami.Com
-%CertMgr% -del -c -sha1 EEC507F719D5BA0CB913F034E045A24A509D8A5F -s Disallowed
-:: Ylmf.Com
-%CertMgr% -del -c -sha1 93A77CA50F165A5873DD3995874867B616AB3644 -s Disallowed
-:: YY Inc
-%CertMgr% -del -c -sha1 B3B89CD7940DC67E4291A3EE767AC17A3BC9E620 -s Disallowed
-
-:: Print to screen.
-@echo.
-@echo RevokeChinaCerts CodeSigning Restore version
-@echo Done. Please confirm the messages on screen.
-@echo.
-@pause
diff --git a/Windows/ArchiveCerts/RevokeChinaCerts_Organization.bat b/Windows/ArchiveCerts/RevokeChinaCerts_Organization.bat
deleted file mode 100644
index 0c3e97c..0000000
--- a/Windows/ArchiveCerts/RevokeChinaCerts_Organization.bat
+++ /dev/null
@@ -1,56 +0,0 @@
-:: RevokeChinaCerts Organization batch
-:: Revoke China Certificates.
-::
-:: Author: Chengr28
-::
-
-@echo off
-
-:: Folder location
-cd /d %~dp0
-cd..
-set Folder=%cd%
-
-:: Architecture check
-set CertMgr="%Folder%\Tools\CertMgr"
-if "%PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432%" == "x86" set CertMgr="%Folder%\Tools\CertMgr_x86"
-
-:: Add certificates to CRL
-set Folder=%Folder%\ArchiveCerts\Organization
-%CertMgr% -add -c "%Folder%\ABC.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\ABC_TEST_CA.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\ABC2048.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\AlibabaCom_Corporation_Root_CA.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\ALIPAY_ROOT.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\Alipay_Trust_NetWork.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\BOCOMCA.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\CCB_CA_ROOT_199906.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\CCB_CA_ROOT_200906.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\CFCA.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\CFCA_CS_CA.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\CFCA_CS_TEST_CA.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\CFCA_Operation_CA3.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\CFCA_RCA.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\CFCA_Root_CA.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\CFCA_RSA_RCA.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\China_Trust_Network_1.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\China_Trust_Network_2.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\China_Trust_Network_3.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\ICBC.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\ICBC_Root_CA.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\IcbcCA.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\iTruschina_CN_Root_CA_1.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\iTruschina_CN_Root_CA_2.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\iTruschina_CN_Root_CA_3.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\Personal_ICBC_CA.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\ROOTCA_OSCCA.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\SZCA.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\SZCA_200307.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\TenpayCom_Root_CA.crt" -s Disallowed
-
-:: Print to screen.
-@echo.
-@echo RevokeChinaCerts Organization version
-@echo Done. Please confirm the messages on screen.
-@echo.
-@pause
diff --git a/Windows/ArchiveCerts/RevokeChinaCerts_Organization_Choice.bat b/Windows/ArchiveCerts/RevokeChinaCerts_Organization_Choice.bat
deleted file mode 100644
index 329680e..0000000
--- a/Windows/ArchiveCerts/RevokeChinaCerts_Organization_Choice.bat
+++ /dev/null
@@ -1,204 +0,0 @@
-:: RevokeChinaCerts Organization Choice batch
-:: Revoke China Certificates.
-::
-:: Author: Chengr28
-::
-
-@echo off
-
-:: Folder location
-cd /d %~dp0
-cd..
-set Folder=%cd%
-
-:: Architecture check
-set CertMgr="%Folder%\Tools\CertMgr"
-if "%PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432%" == "x86" set CertMgr="%Folder%\Tools\CertMgr_x86"
-
-:: Add certificates to CRL
-set Folder=%Folder%\ArchiveCerts\Organization
-set /p UserChoice="Revoke ABC? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-1
-%CertMgr% -add -c "%Folder%\ABC.crt" -s Disallowed
-
-:CERT-1
-@echo.
-set /p UserChoice="Revoke ABC TEST CA? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-2
-%CertMgr% -add -c "%Folder%\ABC_TEST_CA.crt" -s Disallowed
-
-:CERT-2
-@echo.
-set /p UserChoice="Revoke ABC2048? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-3
-%CertMgr% -add -c "%Folder%\ABC2048.crt" -s Disallowed
-
-:CERT-3
-@echo.
-set /p UserChoice="Revoke Alibaba.com Corporation Root CA? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-4
-%CertMgr% -add -c "%Folder%\AlibabaCom_Corporation_Root_CA.crt" -s Disallowed
-
-:CERT-4
-@echo.
-set /p UserChoice="Revoke ALIPAY_ROOT? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-5
-%CertMgr% -add -c "%Folder%\ALIPAY_ROOT.crt" -s Disallowed
-
-:CERT-5
-@echo.
-set /p UserChoice="Revoke Alipay Trust NetWork? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-6
-%CertMgr% -add -c "%Folder%\Alipay_Trust_NetWork.crt" -s Disallowed
-
-:CERT-6
-@echo.
-set /p UserChoice="Revoke BOCOMCA? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-7
-%CertMgr% -add -c "%Folder%\BOCOMCA.crt" -s Disallowed
-
-:CERT-7
-@echo.
-set /p UserChoice="Revoke CCB CA ROOT(1999-06-29)? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-8
-%CertMgr% -add -c "%Folder%\CCB_CA_ROOT_199906.crt" -s Disallowed
-
-:CERT-8
-@echo.
-set /p UserChoice="Revoke CCB CA ROOT(2009-06-01)? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-9
-%CertMgr% -add -c "%Folder%\CCB_CA_ROOT_200906.crt" -s Disallowed
-
-:CERT-9
-@echo.
-set /p UserChoice="Revoke CFCA? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-10
-%CertMgr% -add -c "%Folder%\CFCA.crt" -s Disallowed
-
-:CERT-10
-@echo.
-set /p UserChoice="Revoke CFCA CS CA? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-11
-%CertMgr% -add -c "%Folder%\CFCA_CS_CA.crt" -s Disallowed
-
-:CERT-11
-@echo.
-set /p UserChoice="Revoke CFCA CS TEST CA? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-12
-%CertMgr% -add -c "%Folder%\CFCA_CS_TEST_CA.crt" -s Disallowed
-
-:CERT-12
-@echo.
-set /p UserChoice="Revoke CFCA Operation CA3? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-13
-%CertMgr% -add -c "%Folder%\CFCA_Operation_CA3.crt" -s Disallowed
-
-:CERT-13
-@echo.
-set /p UserChoice="Revoke CFCA RCA? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-14
-%CertMgr% -add -c "%Folder%\CFCA_RCA.crt" -s Disallowed
-
-:CERT-14
-@echo.
-set /p UserChoice="Revoke CFCA Root CA? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-15
-%CertMgr% -add -c "%Folder%\CFCA_Root_CA.crt" -s Disallowed
-
-:CERT-15
-@echo.
-set /p UserChoice="Revoke CFCA RSA RCA? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-16
-%CertMgr% -add -c "%Folder%\CFCA_RSA_RCA.crt" -s Disallowed
-
-:CERT-16
-@echo.
-set /p UserChoice="Revoke China Trust Network(1)? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-17
-%CertMgr% -add -c "%Folder%\China_Trust_Network_1.crt" -s Disallowed
-
-:CERT-17
-@echo.
-set /p UserChoice="Revoke China Trust Network(2)? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-18
-%CertMgr% -add -c "%Folder%\China_Trust_Network_2.crt" -s Disallowed
-
-:CERT-18
-@echo.
-set /p UserChoice="Revoke China Trust Network(3)? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-19
-%CertMgr% -add -c "%Folder%\China_Trust_Network_3.crt" -s Disallowed
-
-:CERT-19
-@echo.
-set /p UserChoice="Revoke ICBC? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-20
-%CertMgr% -add -c "%Folder%\ICBC.crt" -s Disallowed
-
-:CERT-20
-@echo.
-set /p UserChoice="Revoke ICBC Root CA? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-21
-%CertMgr% -add -c "%Folder%\ICBC_Root_CA.crt" -s Disallowed
-
-:CERT-21
-@echo.
-set /p UserChoice="Revoke IcbcCA? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-22
-%CertMgr% -add -c "%Folder%\IcbcCA.crt" -s Disallowed
-
-:CERT-22
-@echo.
-set /p UserChoice="Revoke iTruschina CN Root CA(1)? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-23
-%CertMgr% -add -c "%Folder%\iTruschina_CN_Root_CA_1.crt" -s Disallowed
-
-:CERT-23
-@echo.
-set /p UserChoice="Revoke iTruschina CN Root CA(2)? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-24
-%CertMgr% -add -c "%Folder%\iTruschina_CN_Root_CA_2.crt" -s Disallowed
-
-:CERT-24
-@echo.
-set /p UserChoice="Revoke iTruschina CN Root CA(3)? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-25
-%CertMgr% -add -c "%Folder%\iTruschina_CN_Root_CA_3.crt" -s Disallowed
-
-:CERT-25
-@echo.
-set /p UserChoice="Revoke Personal ICBC CA? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-26
-%CertMgr% -add -c "%Folder%\Personal_ICBC_CA.crt" -s Disallowed
-
-:CERT-26
-@echo.
-set /p UserChoice="Revoke ROOTCA OSCCA? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-27
-%CertMgr% -add -c "%Folder%\ROOTCA_OSCCA.crt" -s Disallowed
-
-:CERT-27
-@echo.
-set /p UserChoice="Revoke SZCA? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-28
-%CertMgr% -add -c "%Folder%\SZCA.crt" -s Disallowed
-
-:CERT-28
-@echo.
-set /p UserChoice="Revoke SZCA(20030722)? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-29
-%CertMgr% -add -c "%Folder%\SZCA_200307.crt" -s Disallowed
-
-:CERT-29
-@echo.
-set /p UserChoice="Revoke TenpayCom Root CA? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto Exit
-%CertMgr% -add -c "%Folder%\TenpayCom_Root_CA.crt" -s Disallowed
-
-:: Print to screen.
-:Exit
-@echo.
-@echo RevokeChinaCerts Organization Choice version
-@echo Done. Please confirm the messages on screen.
-@echo.
-@pause
diff --git a/Windows/ArchiveCerts/RevokeChinaCerts_Organization_Restore.bat b/Windows/ArchiveCerts/RevokeChinaCerts_Organization_Restore.bat
deleted file mode 100644
index c038986..0000000
--- a/Windows/ArchiveCerts/RevokeChinaCerts_Organization_Restore.bat
+++ /dev/null
@@ -1,84 +0,0 @@
-:: RevokeChinaCerts Organization Restore batch
-:: Revoke China Certificates.
-::
-:: Author: Chengr28
-::
-
-@echo off
-
-:: Folder location
-cd /d %~dp0
-cd..
-
-:: Architecture check
-set CertMgr="%cd%\Tools\CertMgr"
-if "%PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432%" == "x86" set CertMgr="%cd%\Tools\CertMgr_x86"
-
-:: Restore certificates
-:: ABC
-%CertMgr% -del -c -sha1 78D0CDF5752D1E5B58A674644CFE3499BF02F9EF -s Disallowed
-:: ABC TEST CA
-%CertMgr% -del -c -sha1 F18C39F8B5A3E9BADC811BBA7690E8D0143BD851 -s Disallowed
-:: ABC2048
-%CertMgr% -del -c -sha1 6FAE9AD81467C5FCB93574670F52C8EF538F8B6D -s Disallowed
-:: Alibaba.com Corporation Root CA
-%CertMgr% -del -c -sha1 A7217F919843199C958C128449DD52D2723B0A8A -s Disallowed
-:: ALIPAY_ROOT
-%CertMgr% -del -c -sha1 59864294A96B3E5C37C058E9D1FBDE5FF0C2E4EE -s Disallowed
-:: Alipay Trust NetWork
-%CertMgr% -del -c -sha1 89A2FB0E332BA7275FE712FEC669D746125B1F32 -s Disallowed
-:: BOCOMCA
-%CertMgr% -del -c -sha1 4571466B830EAC5FCDC22103B9733C1A15CE78AC -s Disallowed
-:: CCB CA ROOT(1999-06-29)
-%CertMgr% -del -c -sha1 3018E5D74DF29E3590F5BB8DF01AA7FC116BB4DE -s Disallowed
-:: CCB CA ROOT(2009-06-01)
-%CertMgr% -del -c -sha1 8582B4AF7491B3D16636EEB32D44993D7DEE6C40 -s Disallowed
-:: CFCA
-%CertMgr% -del -c -sha1 A9743B713E4109381622D3689AB5D9E1DC51B164 -s Disallowed
-:: CFCA CS CA
-%CertMgr% -del -c -sha1 D3FBFAA8A67FC9A2EADBF86AEB5D07A9D6AF322E -s Disallowed
-:: CFCA CS TEST CA
-%CertMgr% -del -c -sha1 B5DCF1C58E86DBED2EA2D217A5C28D11FD9254F0 -s Disallowed
-:: CFCA Operation CA3
-%CertMgr% -del -c -sha1 5A3A3EA74AE5D29F25A670024949869D1222E42A -s Disallowed
-:: CFCA RCA
-%CertMgr% -del -c -sha1 AE73DFF81CF24E50DD52CA1496E7EF94876061CB -s Disallowed
-:: CFCA Root CA
-%CertMgr% -del -c -sha1 31BD6AEF73031C5A49338E7A06040DD815EF7512 -s Disallowed
-:: CFCA RSA RCA
-%CertMgr% -del -c -sha1 57C5CEBB53FBF181E0B13977AF864F1C13F11AA9 -s Disallowed
-:: China Trust Network(1)
-%CertMgr% -del -c -sha1 C2CAEB0DC296FD50596BCA0F53C5364521167039 -s Disallowed
-:: China Trust Network(2)
-%CertMgr% -del -c -sha1 B39B0B24B156D8B6123CAF7BA249DC81F27E39FA -s Disallowed
-:: China Trust Network(3)
-%CertMgr% -del -c -sha1 7C88AE178AE6AB8E69C30AF586D84EF29B6E6AE3 -s Disallowed
-:: ICBC
-%CertMgr% -del -c -sha1 E3F9043072BABF5E9C631960B34CCCF9FFC8BA41 -s Disallowed
-:: ICBC Root CA
-%CertMgr% -del -c -sha1 5A960203C10CFA8D42DD115B61154F98E2F617F7 -s Disallowed
-:: IcbcCA
-%CertMgr% -del -c -sha1 A02A23D13576ECA35498DC69166A20651E203E31 -s Disallowed
-:: iTruschina CN Root CA(1)
-%CertMgr% -del -c -sha1 240A61A2577970625B9F0B81283C4AA4037217B1 -s Disallowed
-:: iTruschina CN Root CA(2)
-%CertMgr% -del -c -sha1 46F168AF009C28C18F452EB85F5E8747892B3C8B -s Disallowed
-:: iTruschina CN Root CA(3)
-%CertMgr% -del -c -sha1 654E9FADD2032AE1B87D6263AF04FD7FEE38D57C -s Disallowed
-:: Personal ICBC CA
-%CertMgr% -del -c -sha1 2ABC81B0D7D052F887965562BB10AA66A80F7674 -s Disallowed
-:: ROOTCA OSCCA
-%CertMgr% -del -c -sha1 DBB84423C928ABE889D0E368FC3191D151DDB1AB -s Disallowed
-:: SZCA
-%CertMgr% -del -c -sha1 B0049D436F27237EE59C746A1EF3C96A8E1B54AC -s Disallowed
-:: SZCA(20030722)
-%CertMgr% -del -c -sha1 90D7A97592F0A3E2165DE5DA23B57701D74A298D -s Disallowed
-:: TenpayCom Root CA
-%CertMgr% -del -c -sha1 56502166C0DE2488950491C90C7560E0E7AA7378 -s Disallowed
-
-:: Print to screen.
-@echo.
-@echo RevokeChinaCerts Organization Restore version
-@echo Done. Please confirm the messages on screen.
-@echo.
-@pause
diff --git a/Windows/ArchiveCerts/SoftCertPolicyAppender/SoftCertPolicyAppender.exe b/Windows/ArchiveCerts/SoftCertPolicyAppender/SoftCertPolicyAppender.exe
deleted file mode 100644
index 956377c4dc666dc077a01d27e453e21b961352ad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 16384
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
OAB#YLlH(6)f&T$2u6dgP
diff --git a/Windows/ArchiveCerts/CodeSigning/91Com.crt b/Windows/Certs/CodeSigning/91Com.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/91Com.crt
rename to Windows/Certs/CodeSigning/91Com.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/BEIJING_KUWO_TECHNOLOGY_COLTD.crt b/Windows/Certs/CodeSigning/BEIJING_KUWO_TECHNOLOGY_COLTD.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/BEIJING_KUWO_TECHNOLOGY_COLTD.crt
rename to Windows/Certs/CodeSigning/BEIJING_KUWO_TECHNOLOGY_COLTD.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/BEIJING_QIYI_CENTURY_SCIENCE_TECHNOLOGY_COLTD.crt b/Windows/Certs/CodeSigning/BEIJING_QIYI_CENTURY_SCIENCE_TECHNOLOGY_COLTD.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/BEIJING_QIYI_CENTURY_SCIENCE_TECHNOLOGY_COLTD.crt
rename to Windows/Certs/CodeSigning/BEIJING_QIYI_CENTURY_SCIENCE_TECHNOLOGY_COLTD.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/Baidu_China_CoLtd.crt b/Windows/Certs/CodeSigning/Baidu_China_CoLtd.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/Baidu_China_CoLtd.crt
rename to Windows/Certs/CodeSigning/Baidu_China_CoLtd.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/Beijing_Baidu_Netcom_Science_And_Technology_CoLtd.crt b/Windows/Certs/CodeSigning/Beijing_Baidu_Netcom_Science_And_Technology_CoLtd.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/Beijing_Baidu_Netcom_Science_And_Technology_CoLtd.crt
rename to Windows/Certs/CodeSigning/Beijing_Baidu_Netcom_Science_And_Technology_CoLtd.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/Beijing_Baofeng_Technology_CoLtd.crt b/Windows/Certs/CodeSigning/Beijing_Baofeng_Technology_CoLtd.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/Beijing_Baofeng_Technology_CoLtd.crt
rename to Windows/Certs/CodeSigning/Beijing_Baofeng_Technology_CoLtd.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/Beijing_Funshion_Online_Technologies_Ltd.crt b/Windows/Certs/CodeSigning/Beijing_Funshion_Online_Technologies_Ltd.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/Beijing_Funshion_Online_Technologies_Ltd.crt
rename to Windows/Certs/CodeSigning/Beijing_Funshion_Online_Technologies_Ltd.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/Beijing_Kingsoft_Security_Software_CoLtd.crt b/Windows/Certs/CodeSigning/Beijing_Kingsoft_Security_Software_CoLtd.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/Beijing_Kingsoft_Security_Software_CoLtd.crt
rename to Windows/Certs/CodeSigning/Beijing_Kingsoft_Security_Software_CoLtd.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/Beijing_Rising_Information_Technology_Corporation_Limited.crt b/Windows/Certs/CodeSigning/Beijing_Rising_Information_Technology_Corporation_Limited.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/Beijing_Rising_Information_Technology_Corporation_Limited.crt
rename to Windows/Certs/CodeSigning/Beijing_Rising_Information_Technology_Corporation_Limited.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/Beijing_Sohu_New_Media_Information_Technology_CoLtd.crt b/Windows/Certs/CodeSigning/Beijing_Sohu_New_Media_Information_Technology_CoLtd.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/Beijing_Sohu_New_Media_Information_Technology_CoLtd.crt
rename to Windows/Certs/CodeSigning/Beijing_Sohu_New_Media_Information_Technology_CoLtd.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/Guangzhou_Tieren_Network_Technology_CoLtd.crt b/Windows/Certs/CodeSigning/Guangzhou_Tieren_Network_Technology_CoLtd.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/Guangzhou_Tieren_Network_Technology_CoLtd.crt
rename to Windows/Certs/CodeSigning/Guangzhou_Tieren_Network_Technology_CoLtd.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/Kingsoft_Security_CoLtd.crt b/Windows/Certs/CodeSigning/Kingsoft_Security_CoLtd.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/Kingsoft_Security_CoLtd.crt
rename to Windows/Certs/CodeSigning/Kingsoft_Security_CoLtd.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/LE_SHI_INTERNET_INFORMATION_TECHNOLOGY_CORP_BEIJING.crt b/Windows/Certs/CodeSigning/LE_SHI_INTERNET_INFORMATION_TECHNOLOGY_CORP_BEIJING.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/LE_SHI_INTERNET_INFORMATION_TECHNOLOGY_CORP_BEIJING.crt
rename to Windows/Certs/CodeSigning/LE_SHI_INTERNET_INFORMATION_TECHNOLOGY_CORP_BEIJING.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/Maxthon_Asia_Limited.crt b/Windows/Certs/CodeSigning/Maxthon_Asia_Limited.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/Maxthon_Asia_Limited.crt
rename to Windows/Certs/CodeSigning/Maxthon_Asia_Limited.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/MeituCom.crt b/Windows/Certs/CodeSigning/MeituCom.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/MeituCom.crt
rename to Windows/Certs/CodeSigning/MeituCom.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/NetEase_Hangzhou_Network_CoLtd.crt b/Windows/Certs/CodeSigning/NetEase_Hangzhou_Network_CoLtd.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/NetEase_Hangzhou_Network_CoLtd.crt
rename to Windows/Certs/CodeSigning/NetEase_Hangzhou_Network_CoLtd.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/PPLive_Corporation.crt b/Windows/Certs/CodeSigning/PPLive_Corporation.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/PPLive_Corporation.crt
rename to Windows/Certs/CodeSigning/PPLive_Corporation.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/Qihoo_360_Software_Beijing_Company_Limited.crt b/Windows/Certs/CodeSigning/Qihoo_360_Software_Beijing_Company_Limited.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/Qihoo_360_Software_Beijing_Company_Limited.crt
rename to Windows/Certs/CodeSigning/Qihoo_360_Software_Beijing_Company_Limited.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/Shanghai_Quan_Tudou_Network_Technology_CoLtd.crt b/Windows/Certs/CodeSigning/Shanghai_Quan_Tudou_Network_Technology_CoLtd.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/Shanghai_Quan_Tudou_Network_Technology_CoLtd.crt
rename to Windows/Certs/CodeSigning/Shanghai_Quan_Tudou_Network_Technology_CoLtd.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/ShenZhen_Xunlei_Networking_Technologies_Ltd.crt b/Windows/Certs/CodeSigning/ShenZhen_Xunlei_Networking_Technologies_Ltd.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/ShenZhen_Xunlei_Networking_Technologies_Ltd.crt
rename to Windows/Certs/CodeSigning/ShenZhen_Xunlei_Networking_Technologies_Ltd.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/TAOBAO_CHINA_SOFTWARE_COLTD.crt b/Windows/Certs/CodeSigning/TAOBAO_CHINA_SOFTWARE_COLTD.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/TAOBAO_CHINA_SOFTWARE_COLTD.crt
rename to Windows/Certs/CodeSigning/TAOBAO_CHINA_SOFTWARE_COLTD.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/Tencent_Technology_Shenzhen_Company_Limited.crt b/Windows/Certs/CodeSigning/Tencent_Technology_Shenzhen_Company_Limited.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/Tencent_Technology_Shenzhen_Company_Limited.crt
rename to Windows/Certs/CodeSigning/Tencent_Technology_Shenzhen_Company_Limited.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/Tencent_Technology_Shenzhen_Company_Limited_201001.crt b/Windows/Certs/CodeSigning/Tencent_Technology_Shenzhen_Company_Limited_201001.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/Tencent_Technology_Shenzhen_Company_Limited_201001.crt
rename to Windows/Certs/CodeSigning/Tencent_Technology_Shenzhen_Company_Limited_201001.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/UC_Mobile_Limited.crt b/Windows/Certs/CodeSigning/UC_Mobile_Limited.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/UC_Mobile_Limited.crt
rename to Windows/Certs/CodeSigning/UC_Mobile_Limited.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/Wandou_Technology_Ltd.crt b/Windows/Certs/CodeSigning/Wandou_Technology_Ltd.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/Wandou_Technology_Ltd.crt
rename to Windows/Certs/CodeSigning/Wandou_Technology_Ltd.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/WoSign_Code_Signing_Authority_UTN_USERFirst_Object.crt b/Windows/Certs/CodeSigning/WoSign_Code_Signing_Authority_UTN_USERFirst_Object.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/WoSign_Code_Signing_Authority_UTN_USERFirst_Object.crt
rename to Windows/Certs/CodeSigning/WoSign_Code_Signing_Authority_UTN_USERFirst_Object.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/WoTrust_Code_Signing_Authority_UTN_USERFirst_Object.crt b/Windows/Certs/CodeSigning/WoTrust_Code_Signing_Authority_UTN_USERFirst_Object.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/WoTrust_Code_Signing_Authority_UTN_USERFirst_Object.crt
rename to Windows/Certs/CodeSigning/WoTrust_Code_Signing_Authority_UTN_USERFirst_Object.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/Xiamen_Yitianxia_Network_Technology_CoLtd.crt b/Windows/Certs/CodeSigning/Xiamen_Yitianxia_Network_Technology_CoLtd.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/Xiamen_Yitianxia_Network_Technology_CoLtd.crt
rename to Windows/Certs/CodeSigning/Xiamen_Yitianxia_Network_Technology_CoLtd.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/XiamiCom.crt b/Windows/Certs/CodeSigning/XiamiCom.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/XiamiCom.crt
rename to Windows/Certs/CodeSigning/XiamiCom.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/YY_Inc.crt b/Windows/Certs/CodeSigning/YY_Inc.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/YY_Inc.crt
rename to Windows/Certs/CodeSigning/YY_Inc.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/YlmfCom.crt b/Windows/Certs/CodeSigning/YlmfCom.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/YlmfCom.crt
rename to Windows/Certs/CodeSigning/YlmfCom.crt
diff --git a/Windows/ArchiveCerts/Organization/Autoridad_de_Certificacion_Raiz_del_Estado_Venezolano_200702.crt b/Windows/Certs/Online/Autoridad_de_Certificacion_Raiz_del_Estado_Venezolano_200702.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/Autoridad_de_Certificacion_Raiz_del_Estado_Venezolano_200702.crt
rename to Windows/Certs/Online/Autoridad_de_Certificacion_Raiz_del_Estado_Venezolano_200702.crt
diff --git a/Windows/ArchiveCerts/Organization/Autoridad_de_Certificacion_Raiz_del_Estado_Venezolano_201012.crt b/Windows/Certs/Online/Autoridad_de_Certificacion_Raiz_del_Estado_Venezolano_201012.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/Autoridad_de_Certificacion_Raiz_del_Estado_Venezolano_201012.crt
rename to Windows/Certs/Online/Autoridad_de_Certificacion_Raiz_del_Estado_Venezolano_201012.crt
diff --git a/Windows/Certs/CFCA_EV_ROOT.crt b/Windows/Certs/Online/CFCA_EV_ROOT.crt
similarity index 100%
rename from Windows/Certs/CFCA_EV_ROOT.crt
rename to Windows/Certs/Online/CFCA_EV_ROOT.crt
diff --git a/Windows/Certs/CFCA_GT_CA_201106.crt b/Windows/Certs/Online/CFCA_GT_CA_201106.crt
similarity index 100%
rename from Windows/Certs/CFCA_GT_CA_201106.crt
rename to Windows/Certs/Online/CFCA_GT_CA_201106.crt
diff --git a/Windows/Certs/CFCA_GT_CA_201208.crt b/Windows/Certs/Online/CFCA_GT_CA_201208.crt
similarity index 100%
rename from Windows/Certs/CFCA_GT_CA_201208.crt
rename to Windows/Certs/Online/CFCA_GT_CA_201208.crt
diff --git a/Windows/Certs/CNNIC_ROOT.crt b/Windows/Certs/Online/CNNIC_ROOT.crt
similarity index 100%
rename from Windows/Certs/CNNIC_ROOT.crt
rename to Windows/Certs/Online/CNNIC_ROOT.crt
diff --git a/Windows/Certs/CNNIC_SSL_Entrust.crt b/Windows/Certs/Online/CNNIC_SSL_Entrust.crt
similarity index 100%
rename from Windows/Certs/CNNIC_SSL_Entrust.crt
rename to Windows/Certs/Online/CNNIC_SSL_Entrust.crt
diff --git a/Windows/Certs/Certification_Authority_Of_WoSign.crt b/Windows/Certs/Online/Certification_Authority_Of_WoSign.crt
similarity index 100%
rename from Windows/Certs/Certification_Authority_Of_WoSign.crt
rename to Windows/Certs/Online/Certification_Authority_Of_WoSign.crt
diff --git a/Windows/Certs/Certification_Authority_Of_WoSign_200908.crt b/Windows/Certs/Online/Certification_Authority_Of_WoSign_200908.crt
similarity index 100%
rename from Windows/Certs/Certification_Authority_Of_WoSign_200908.crt
rename to Windows/Certs/Online/Certification_Authority_Of_WoSign_200908.crt
diff --git a/Windows/Certs/Certification_Authority_Of_WoSign_Chinese.crt b/Windows/Certs/Online/Certification_Authority_Of_WoSign_Chinese.crt
similarity index 100%
rename from Windows/Certs/Certification_Authority_Of_WoSign_Chinese.crt
rename to Windows/Certs/Online/Certification_Authority_Of_WoSign_Chinese.crt
diff --git a/Windows/Certs/Certification_Authority_Of_WoSign_Chinese_StartCom.crt b/Windows/Certs/Online/Certification_Authority_Of_WoSign_Chinese_StartCom.crt
similarity index 100%
rename from Windows/Certs/Certification_Authority_Of_WoSign_Chinese_StartCom.crt
rename to Windows/Certs/Online/Certification_Authority_Of_WoSign_Chinese_StartCom.crt
diff --git a/Windows/Certs/Certification_Authority_Of_WoSign_StartCom_200609.crt b/Windows/Certs/Online/Certification_Authority_Of_WoSign_StartCom_200609.crt
similarity index 100%
rename from Windows/Certs/Certification_Authority_Of_WoSign_StartCom_200609.crt
rename to Windows/Certs/Online/Certification_Authority_Of_WoSign_StartCom_200609.crt
diff --git a/Windows/Certs/Certification_Authority_Of_WoSign_StartCom_201103_1.crt b/Windows/Certs/Online/Certification_Authority_Of_WoSign_StartCom_201103_1.crt
similarity index 100%
rename from Windows/Certs/Certification_Authority_Of_WoSign_StartCom_201103_1.crt
rename to Windows/Certs/Online/Certification_Authority_Of_WoSign_StartCom_201103_1.crt
diff --git a/Windows/Certs/Certification_Authority_Of_WoSign_StartCom_201103_2.crt b/Windows/Certs/Online/Certification_Authority_Of_WoSign_StartCom_201103_2.crt
similarity index 100%
rename from Windows/Certs/Certification_Authority_Of_WoSign_StartCom_201103_2.crt
rename to Windows/Certs/Online/Certification_Authority_Of_WoSign_StartCom_201103_2.crt
diff --git a/Windows/Certs/Certification_Authority_Of_WoSign_USERTrust.crt b/Windows/Certs/Online/Certification_Authority_Of_WoSign_USERTrust.crt
similarity index 100%
rename from Windows/Certs/Certification_Authority_Of_WoSign_USERTrust.crt
rename to Windows/Certs/Online/Certification_Authority_Of_WoSign_USERTrust.crt
diff --git a/Windows/Certs/China_Internet_Network_Information_Center_EV_Certificates_Root.crt b/Windows/Certs/Online/China_Internet_Network_Information_Center_EV_Certificates_Root.crt
similarity index 100%
rename from Windows/Certs/China_Internet_Network_Information_Center_EV_Certificates_Root.crt
rename to Windows/Certs/Online/China_Internet_Network_Information_Center_EV_Certificates_Root.crt
diff --git a/Windows/Certs/Class_1_Primary_CA.crt b/Windows/Certs/Online/Class_1_Primary_CA.crt
similarity index 100%
rename from Windows/Certs/Class_1_Primary_CA.crt
rename to Windows/Certs/Online/Class_1_Primary_CA.crt
diff --git a/Windows/Certs/GiantRootCA.crt b/Windows/Certs/Online/GiantRootCA.crt
similarity index 100%
rename from Windows/Certs/GiantRootCA.crt
rename to Windows/Certs/Online/GiantRootCA.crt
diff --git a/Windows/Certs/Government_Root_Certification_Authority.crt b/Windows/Certs/Online/Government_Root_Certification_Authority.crt
similarity index 100%
rename from Windows/Certs/Government_Root_Certification_Authority.crt
rename to Windows/Certs/Online/Government_Root_Certification_Authority.crt
diff --git a/Windows/Certs/Hongkong_Post_Root_CA.crt b/Windows/Certs/Online/Hongkong_Post_Root_CA.crt
similarity index 100%
rename from Windows/Certs/Hongkong_Post_Root_CA.crt
rename to Windows/Certs/Online/Hongkong_Post_Root_CA.crt
diff --git a/Windows/Certs/Hongkong_Post_Root_CA_1.crt b/Windows/Certs/Online/Hongkong_Post_Root_CA_1.crt
similarity index 100%
rename from Windows/Certs/Hongkong_Post_Root_CA_1.crt
rename to Windows/Certs/Online/Hongkong_Post_Root_CA_1.crt
diff --git a/Windows/Certs/JGZXCA.crt b/Windows/Certs/Online/JGZXCA.crt
similarity index 100%
rename from Windows/Certs/JGZXCA.crt
rename to Windows/Certs/Online/JGZXCA.crt
diff --git a/Windows/Certs/Macao_Post_eSignTrust_Root_Certification_Authority.crt b/Windows/Certs/Online/Macao_Post_eSignTrust_Root_Certification_Authority.crt
similarity index 100%
rename from Windows/Certs/Macao_Post_eSignTrust_Root_Certification_Authority.crt
rename to Windows/Certs/Online/Macao_Post_eSignTrust_Root_Certification_Authority.crt
diff --git a/Windows/Certs/Macao_Post_eSignTrust_Root_Certification_Authority_G02.crt b/Windows/Certs/Online/Macao_Post_eSignTrust_Root_Certification_Authority_G02.crt
similarity index 100%
rename from Windows/Certs/Macao_Post_eSignTrust_Root_Certification_Authority_G02.crt
rename to Windows/Certs/Online/Macao_Post_eSignTrust_Root_Certification_Authority_G02.crt
diff --git a/Windows/Certs/SRCA.crt b/Windows/Certs/Online/SRCA.crt
similarity index 100%
rename from Windows/Certs/SRCA.crt
rename to Windows/Certs/Online/SRCA.crt
diff --git a/Windows/Certs/Superfish_Inc.crt b/Windows/Certs/Online/Superfish_Inc.crt
similarity index 100%
rename from Windows/Certs/Superfish_Inc.crt
rename to Windows/Certs/Online/Superfish_Inc.crt
diff --git a/Windows/Certs/TWCA_Global_Root_CA.crt b/Windows/Certs/Online/TWCA_Global_Root_CA.crt
similarity index 100%
rename from Windows/Certs/TWCA_Global_Root_CA.crt
rename to Windows/Certs/Online/TWCA_Global_Root_CA.crt
diff --git a/Windows/Certs/TWCA_Root_Certification_Authority_1.crt b/Windows/Certs/Online/TWCA_Root_Certification_Authority_1.crt
similarity index 100%
rename from Windows/Certs/TWCA_Root_Certification_Authority_1.crt
rename to Windows/Certs/Online/TWCA_Root_Certification_Authority_1.crt
diff --git a/Windows/Certs/TWCA_Root_Certification_Authority_2.crt b/Windows/Certs/Online/TWCA_Root_Certification_Authority_2.crt
similarity index 100%
rename from Windows/Certs/TWCA_Root_Certification_Authority_2.crt
rename to Windows/Certs/Online/TWCA_Root_Certification_Authority_2.crt
diff --git a/Windows/Certs/TWCA_Secure_CA_Baltimore.crt b/Windows/Certs/Online/TWCA_Secure_CA_Baltimore.crt
similarity index 100%
rename from Windows/Certs/TWCA_Secure_CA_Baltimore.crt
rename to Windows/Certs/Online/TWCA_Secure_CA_Baltimore.crt
diff --git a/Windows/Certs/TWCA_Secure_Certification_Authority_USERTrust.crt b/Windows/Certs/Online/TWCA_Secure_Certification_Authority_USERTrust.crt
similarity index 100%
rename from Windows/Certs/TWCA_Secure_Certification_Authority_USERTrust.crt
rename to Windows/Certs/Online/TWCA_Secure_Certification_Authority_USERTrust.crt
diff --git a/Windows/Certs/TaiCA_Secure_CA_GTE.crt b/Windows/Certs/Online/TaiCA_Secure_CA_GTE.crt
similarity index 100%
rename from Windows/Certs/TaiCA_Secure_CA_GTE.crt
rename to Windows/Certs/Online/TaiCA_Secure_CA_GTE.crt
diff --git a/Windows/Certs/UCA_Extended_Validation_Root.crt b/Windows/Certs/Online/UCA_Extended_Validation_Root.crt
similarity index 100%
rename from Windows/Certs/UCA_Extended_Validation_Root.crt
rename to Windows/Certs/Online/UCA_Extended_Validation_Root.crt
diff --git a/Windows/Certs/UCA_Global_Root.crt b/Windows/Certs/Online/UCA_Global_Root.crt
similarity index 100%
rename from Windows/Certs/UCA_Global_Root.crt
rename to Windows/Certs/Online/UCA_Global_Root.crt
diff --git a/Windows/Certs/UCA_Root_200101.crt b/Windows/Certs/Online/UCA_Root_200101.crt
similarity index 100%
rename from Windows/Certs/UCA_Root_200101.crt
rename to Windows/Certs/Online/UCA_Root_200101.crt
diff --git a/Windows/Certs/UCA_Root_200401.crt b/Windows/Certs/Online/UCA_Root_200401.crt
similarity index 100%
rename from Windows/Certs/UCA_Root_200401.crt
rename to Windows/Certs/Online/UCA_Root_200401.crt
diff --git a/Windows/Certs/WoSign_Client_Authority_USERTrust.crt b/Windows/Certs/Online/WoSign_Client_Authority_USERTrust.crt
similarity index 100%
rename from Windows/Certs/WoSign_Client_Authority_USERTrust.crt
rename to Windows/Certs/Online/WoSign_Client_Authority_USERTrust.crt
diff --git a/Windows/Certs/WoSign_Premium_Server_Authority_USERTrust.crt b/Windows/Certs/Online/WoSign_Premium_Server_Authority_USERTrust.crt
similarity index 100%
rename from Windows/Certs/WoSign_Premium_Server_Authority_USERTrust.crt
rename to Windows/Certs/Online/WoSign_Premium_Server_Authority_USERTrust.crt
diff --git a/Windows/Certs/WoSign_SGC_Server_Authority_USERTrust.crt b/Windows/Certs/Online/WoSign_SGC_Server_Authority_USERTrust.crt
similarity index 100%
rename from Windows/Certs/WoSign_SGC_Server_Authority_USERTrust.crt
rename to Windows/Certs/Online/WoSign_SGC_Server_Authority_USERTrust.crt
diff --git a/Windows/Certs/WoSign_Server_Authority_USERTrust.crt b/Windows/Certs/Online/WoSign_Server_Authority_USERTrust.crt
similarity index 100%
rename from Windows/Certs/WoSign_Server_Authority_USERTrust.crt
rename to Windows/Certs/Online/WoSign_Server_Authority_USERTrust.crt
diff --git a/Windows/Certs/WoTrust_Client_Authority_USERTrust.crt b/Windows/Certs/Online/WoTrust_Client_Authority_USERTrust.crt
similarity index 100%
rename from Windows/Certs/WoTrust_Client_Authority_USERTrust.crt
rename to Windows/Certs/Online/WoTrust_Client_Authority_USERTrust.crt
diff --git a/Windows/Certs/WoTrust_Premium_Server_Authority_USERTrust.crt b/Windows/Certs/Online/WoTrust_Premium_Server_Authority_USERTrust.crt
similarity index 100%
rename from Windows/Certs/WoTrust_Premium_Server_Authority_USERTrust.crt
rename to Windows/Certs/Online/WoTrust_Premium_Server_Authority_USERTrust.crt
diff --git a/Windows/Certs/WoTrust_SGC_Server_Authority_USERTrust.crt b/Windows/Certs/Online/WoTrust_SGC_Server_Authority_USERTrust.crt
similarity index 100%
rename from Windows/Certs/WoTrust_SGC_Server_Authority_USERTrust.crt
rename to Windows/Certs/Online/WoTrust_SGC_Server_Authority_USERTrust.crt
diff --git a/Windows/Certs/WoTrust_Server_Authority_USERTrust.crt b/Windows/Certs/Online/WoTrust_Server_Authority_USERTrust.crt
similarity index 100%
rename from Windows/Certs/WoTrust_Server_Authority_USERTrust.crt
rename to Windows/Certs/Online/WoTrust_Server_Authority_USERTrust.crt
diff --git a/Windows/Certs/[Fake]AnyHotmailCom_201501.crt b/Windows/Certs/Online/[Fake]AnyHotmailCom_201501.crt
similarity index 100%
rename from Windows/Certs/[Fake]AnyHotmailCom_201501.crt
rename to Windows/Certs/Online/[Fake]AnyHotmailCom_201501.crt
diff --git a/Windows/Certs/[Fake]GitHubCom_201301.crt b/Windows/Certs/Online/[Fake]GitHubCom_201301.crt
similarity index 100%
rename from Windows/Certs/[Fake]GitHubCom_201301.crt
rename to Windows/Certs/Online/[Fake]GitHubCom_201301.crt
diff --git a/Windows/Certs/[Fake]GoogleCom_201407.crt b/Windows/Certs/Online/[Fake]GoogleCom_201407.crt
similarity index 100%
rename from Windows/Certs/[Fake]GoogleCom_201407.crt
rename to Windows/Certs/Online/[Fake]GoogleCom_201407.crt
diff --git a/Windows/Certs/[Fake]GoogleCom_201409.crt b/Windows/Certs/Online/[Fake]GoogleCom_201409.crt
similarity index 100%
rename from Windows/Certs/[Fake]GoogleCom_201409.crt
rename to Windows/Certs/Online/[Fake]GoogleCom_201409.crt
diff --git a/Windows/Certs/[Fake]HotmaiCom_201410.crt b/Windows/Certs/Online/[Fake]HotmaiCom_201410.crt
similarity index 100%
rename from Windows/Certs/[Fake]HotmaiCom_201410.crt
rename to Windows/Certs/Online/[Fake]HotmaiCom_201410.crt
diff --git a/Windows/Certs/[Fake]WwwFacebookCom_201410.crt b/Windows/Certs/Online/[Fake]WwwFacebookCom_201410.crt
similarity index 100%
rename from Windows/Certs/[Fake]WwwFacebookCom_201410.crt
rename to Windows/Certs/Online/[Fake]WwwFacebookCom_201410.crt
diff --git a/Windows/Certs/[Fake]WwwIcloudCom_201410.crt b/Windows/Certs/Online/[Fake]WwwIcloudCom_201410.crt
similarity index 100%
rename from Windows/Certs/[Fake]WwwIcloudCom_201410.crt
rename to Windows/Certs/Online/[Fake]WwwIcloudCom_201410.crt
diff --git a/Windows/Certs/[Fake]YahooCom_201409.crt b/Windows/Certs/Online/[Fake]YahooCom_201409.crt
similarity index 100%
rename from Windows/Certs/[Fake]YahooCom_201409.crt
rename to Windows/Certs/Online/[Fake]YahooCom_201409.crt
diff --git a/Windows/Certs/[Suspicious]GoAgent_CA.crt b/Windows/Certs/Online/[Suspicious]GoAgent_CA.crt
similarity index 100%
rename from Windows/Certs/[Suspicious]GoAgent_CA.crt
rename to Windows/Certs/Online/[Suspicious]GoAgent_CA.crt
diff --git a/Windows/Certs/[Suspicious]WaccBaiduCom.crt b/Windows/Certs/Online/[Suspicious]WaccBaiduCom.crt
similarity index 100%
rename from Windows/Certs/[Suspicious]WaccBaiduCom.crt
rename to Windows/Certs/Online/[Suspicious]WaccBaiduCom.crt
diff --git a/Windows/Certs/ePKI_Root_Certification_Authority.crt b/Windows/Certs/Online/ePKI_Root_Certification_Authority.crt
similarity index 100%
rename from Windows/Certs/ePKI_Root_Certification_Authority.crt
rename to Windows/Certs/Online/ePKI_Root_Certification_Authority.crt
diff --git a/Windows/ArchiveCerts/Organization/ABC.crt b/Windows/Certs/Organization/ABC.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/ABC.crt
rename to Windows/Certs/Organization/ABC.crt
diff --git a/Windows/ArchiveCerts/Organization/ABC2048.crt b/Windows/Certs/Organization/ABC2048.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/ABC2048.crt
rename to Windows/Certs/Organization/ABC2048.crt
diff --git a/Windows/ArchiveCerts/Organization/ABC_TEST_CA.crt b/Windows/Certs/Organization/ABC_TEST_CA.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/ABC_TEST_CA.crt
rename to Windows/Certs/Organization/ABC_TEST_CA.crt
diff --git a/Windows/ArchiveCerts/Organization/ALIPAY_ROOT.crt b/Windows/Certs/Organization/ALIPAY_ROOT.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/ALIPAY_ROOT.crt
rename to Windows/Certs/Organization/ALIPAY_ROOT.crt
diff --git a/Windows/ArchiveCerts/Organization/AlibabaCom_Corporation_Root_CA.crt b/Windows/Certs/Organization/AlibabaCom_Corporation_Root_CA.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/AlibabaCom_Corporation_Root_CA.crt
rename to Windows/Certs/Organization/AlibabaCom_Corporation_Root_CA.crt
diff --git a/Windows/ArchiveCerts/Organization/Alipay_Trust_NetWork.crt b/Windows/Certs/Organization/Alipay_Trust_NetWork.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/Alipay_Trust_NetWork.crt
rename to Windows/Certs/Organization/Alipay_Trust_NetWork.crt
diff --git a/Windows/ArchiveCerts/Organization/BOCOMCA.crt b/Windows/Certs/Organization/BOCOMCA.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/BOCOMCA.crt
rename to Windows/Certs/Organization/BOCOMCA.crt
diff --git a/Windows/ArchiveCerts/Organization/CCB_CA_ROOT_199906.crt b/Windows/Certs/Organization/CCB_CA_ROOT_199906.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/CCB_CA_ROOT_199906.crt
rename to Windows/Certs/Organization/CCB_CA_ROOT_199906.crt
diff --git a/Windows/ArchiveCerts/Organization/CCB_CA_ROOT_200906.crt b/Windows/Certs/Organization/CCB_CA_ROOT_200906.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/CCB_CA_ROOT_200906.crt
rename to Windows/Certs/Organization/CCB_CA_ROOT_200906.crt
diff --git a/Windows/ArchiveCerts/Organization/CFCA.crt b/Windows/Certs/Organization/CFCA.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/CFCA.crt
rename to Windows/Certs/Organization/CFCA.crt
diff --git a/Windows/ArchiveCerts/Organization/CFCA_CS_CA.crt b/Windows/Certs/Organization/CFCA_CS_CA.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/CFCA_CS_CA.crt
rename to Windows/Certs/Organization/CFCA_CS_CA.crt
diff --git a/Windows/ArchiveCerts/Organization/CFCA_CS_SM2_CA.crt b/Windows/Certs/Organization/CFCA_CS_SM2_CA.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/CFCA_CS_SM2_CA.crt
rename to Windows/Certs/Organization/CFCA_CS_SM2_CA.crt
diff --git a/Windows/ArchiveCerts/Organization/CFCA_CS_TEST_CA.crt b/Windows/Certs/Organization/CFCA_CS_TEST_CA.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/CFCA_CS_TEST_CA.crt
rename to Windows/Certs/Organization/CFCA_CS_TEST_CA.crt
diff --git a/Windows/ArchiveCerts/Organization/CFCA_CS_TEST_SM2_CA.crt b/Windows/Certs/Organization/CFCA_CS_TEST_SM2_CA.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/CFCA_CS_TEST_SM2_CA.crt
rename to Windows/Certs/Organization/CFCA_CS_TEST_SM2_CA.crt
diff --git a/Windows/ArchiveCerts/Organization/CFCA_EV_SM2_ROOT.crt b/Windows/Certs/Organization/CFCA_EV_SM2_ROOT.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/CFCA_EV_SM2_ROOT.crt
rename to Windows/Certs/Organization/CFCA_EV_SM2_ROOT.crt
diff --git a/Windows/ArchiveCerts/Organization/CFCA_GT_SM2_CA.crt b/Windows/Certs/Organization/CFCA_GT_SM2_CA.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/CFCA_GT_SM2_CA.crt
rename to Windows/Certs/Organization/CFCA_GT_SM2_CA.crt
diff --git a/Windows/ArchiveCerts/Organization/CFCA_Operation_CA3.crt b/Windows/Certs/Organization/CFCA_Operation_CA3.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/CFCA_Operation_CA3.crt
rename to Windows/Certs/Organization/CFCA_Operation_CA3.crt
diff --git a/Windows/ArchiveCerts/Organization/CFCA_RCA.crt b/Windows/Certs/Organization/CFCA_RCA.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/CFCA_RCA.crt
rename to Windows/Certs/Organization/CFCA_RCA.crt
diff --git a/Windows/ArchiveCerts/Organization/CFCA_RSA_RCA.crt b/Windows/Certs/Organization/CFCA_RSA_RCA.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/CFCA_RSA_RCA.crt
rename to Windows/Certs/Organization/CFCA_RSA_RCA.crt
diff --git a/Windows/ArchiveCerts/Organization/CFCA_Root_CA.crt b/Windows/Certs/Organization/CFCA_Root_CA.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/CFCA_Root_CA.crt
rename to Windows/Certs/Organization/CFCA_Root_CA.crt
diff --git a/Windows/ArchiveCerts/Organization/CFCA_SM2_RCA.crt b/Windows/Certs/Organization/CFCA_SM2_RCA.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/CFCA_SM2_RCA.crt
rename to Windows/Certs/Organization/CFCA_SM2_RCA.crt
diff --git a/Windows/ArchiveCerts/Organization/China_Trust_Network_1.crt b/Windows/Certs/Organization/China_Trust_Network_1.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/China_Trust_Network_1.crt
rename to Windows/Certs/Organization/China_Trust_Network_1.crt
diff --git a/Windows/ArchiveCerts/Organization/China_Trust_Network_2.crt b/Windows/Certs/Organization/China_Trust_Network_2.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/China_Trust_Network_2.crt
rename to Windows/Certs/Organization/China_Trust_Network_2.crt
diff --git a/Windows/ArchiveCerts/Organization/China_Trust_Network_3.crt b/Windows/Certs/Organization/China_Trust_Network_3.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/China_Trust_Network_3.crt
rename to Windows/Certs/Organization/China_Trust_Network_3.crt
diff --git a/Windows/ArchiveCerts/Organization/ICBC.crt b/Windows/Certs/Organization/ICBC.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/ICBC.crt
rename to Windows/Certs/Organization/ICBC.crt
diff --git a/Windows/ArchiveCerts/Organization/ICBC_Root_CA.crt b/Windows/Certs/Organization/ICBC_Root_CA.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/ICBC_Root_CA.crt
rename to Windows/Certs/Organization/ICBC_Root_CA.crt
diff --git a/Windows/ArchiveCerts/Organization/IcbcCA.crt b/Windows/Certs/Organization/IcbcCA.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/IcbcCA.crt
rename to Windows/Certs/Organization/IcbcCA.crt
diff --git a/Windows/ArchiveCerts/Organization/Personal_ICBC_CA.crt b/Windows/Certs/Organization/Personal_ICBC_CA.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/Personal_ICBC_CA.crt
rename to Windows/Certs/Organization/Personal_ICBC_CA.crt
diff --git a/Windows/ArchiveCerts/Organization/ROOTCA_NRCAC.crt b/Windows/Certs/Organization/ROOTCA_NRCAC.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/ROOTCA_NRCAC.crt
rename to Windows/Certs/Organization/ROOTCA_NRCAC.crt
diff --git a/Windows/ArchiveCerts/Organization/ROOTCA_OSCCA.crt b/Windows/Certs/Organization/ROOTCA_OSCCA.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/ROOTCA_OSCCA.crt
rename to Windows/Certs/Organization/ROOTCA_OSCCA.crt
diff --git a/Windows/ArchiveCerts/Organization/SZCA.crt b/Windows/Certs/Organization/SZCA.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/SZCA.crt
rename to Windows/Certs/Organization/SZCA.crt
diff --git a/Windows/ArchiveCerts/Organization/SZCA_200307.crt b/Windows/Certs/Organization/SZCA_200307.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/SZCA_200307.crt
rename to Windows/Certs/Organization/SZCA_200307.crt
diff --git a/Windows/ArchiveCerts/Organization/TenpayCom_Root_CA.crt b/Windows/Certs/Organization/TenpayCom_Root_CA.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/TenpayCom_Root_CA.crt
rename to Windows/Certs/Organization/TenpayCom_Root_CA.crt
diff --git a/Windows/ArchiveCerts/Organization/iTruschina_CN_Root_CA_1.crt b/Windows/Certs/Organization/iTruschina_CN_Root_CA_1.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/iTruschina_CN_Root_CA_1.crt
rename to Windows/Certs/Organization/iTruschina_CN_Root_CA_1.crt
diff --git a/Windows/ArchiveCerts/Organization/iTruschina_CN_Root_CA_2.crt b/Windows/Certs/Organization/iTruschina_CN_Root_CA_2.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/iTruschina_CN_Root_CA_2.crt
rename to Windows/Certs/Organization/iTruschina_CN_Root_CA_2.crt
diff --git a/Windows/ArchiveCerts/Organization/iTruschina_CN_Root_CA_3.crt b/Windows/Certs/Organization/iTruschina_CN_Root_CA_3.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/iTruschina_CN_Root_CA_3.crt
rename to Windows/Certs/Organization/iTruschina_CN_Root_CA_3.crt
diff --git a/Windows/RevokeChinaCerts_Base.bat b/Windows/RevokeChinaCerts_Base.bat
deleted file mode 100644
index 82088c3..0000000
--- a/Windows/RevokeChinaCerts_Base.bat
+++ /dev/null
@@ -1,114 +0,0 @@
-:: RevokeChinaCerts Base batch
-:: Revoke China Certificates.
-::
-:: Author: JayXon, Chengr28
-::
-
-@echo off
-
-:: Update certificates list of system.
-cd /d %~dp0
-"%~dp0\Tools\RootSUPD_201403_x86"
-
-:: Architecture check
-set CertMgr="%~dp0\Tools\CertMgr"
-if "%PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432%" == "x86" set CertMgr="%~dp0\Tools\CertMgr_x86"
-
-:: Delete certificates(Base part)
-:: Fake github.com(2013-01-25)
-%CertMgr% -del -c -sha1 27A29C3A8B3261770E8B59448557DC9E9339E68C -s -r localMachine Root
-%CertMgr% -del -c -sha1 27A29C3A8B3261770E8B59448557DC9E9339E68C -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 27A29C3A8B3261770E8B59448557DC9E9339E68C -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 27A29C3A8B3261770E8B59448557DC9E9339E68C -s -r CurrentUser AuthRoot
-:: Fake google.com(2014-07-24)
-%CertMgr% -del -c -sha1 F6BEADB9BC02E0A152D71C318739CDECFC1C085D -s -r localMachine Root
-%CertMgr% -del -c -sha1 F6BEADB9BC02E0A152D71C318739CDECFC1C085D -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 F6BEADB9BC02E0A152D71C318739CDECFC1C085D -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 F6BEADB9BC02E0A152D71C318739CDECFC1C085D -s -r CurrentUser AuthRoot
-:: Fake google.com(2014-09-18) [YFdyh000]
-%CertMgr% -del -c -sha1 316076F2866588DBB233C7F9EB68B58125150C21 -s -r localMachine Root
-%CertMgr% -del -c -sha1 316076F2866588DBB233C7F9EB68B58125150C21 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 316076F2866588DBB233C7F9EB68B58125150C21 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 316076F2866588DBB233C7F9EB68B58125150C21 -s -r CurrentUser AuthRoot
-:: Fake yahoo.com(2014-09-30)
-%CertMgr% -del -c -sha1 2290C311EA0F3F57E06DF45B698E18E828E59BC3 -s -r localMachine Root
-%CertMgr% -del -c -sha1 2290C311EA0F3F57E06DF45B698E18E828E59BC3 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 2290C311EA0F3F57E06DF45B698E18E828E59BC3 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 2290C311EA0F3F57E06DF45B698E18E828E59BC3 -s -r CurrentUser AuthRoot
-:: Fake hotmai.com(2014-10-02)
-%CertMgr% -del -c -sha1 30F3B3ADC6E570BDA606B9F96DE24190CE262C67 -s -r localMachine Root
-%CertMgr% -del -c -sha1 30F3B3ADC6E570BDA606B9F96DE24190CE262C67 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 30F3B3ADC6E570BDA606B9F96DE24190CE262C67 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 30F3B3ADC6E570BDA606B9F96DE24190CE262C67 -s -r CurrentUser AuthRoot
-:: Fake www.facebook.com(2014-10-08) [Yiwen Zhang]
-%CertMgr% -del -c -sha1 DC6EE6EDC4C078E1B2C12F6D1985000E27CFD318 -s -r localMachine Root
-%CertMgr% -del -c -sha1 DC6EE6EDC4C078E1B2C12F6D1985000E27CFD318 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 DC6EE6EDC4C078E1B2C12F6D1985000E27CFD318 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 DC6EE6EDC4C078E1B2C12F6D1985000E27CFD318 -s -r CurrentUser AuthRoot
-:: Fake www.icound.com(2014-10-04) [YFdyh000]
-%CertMgr% -del -c -sha1 F468B5F3FED807974476A22B32EA3137D924F7BA -s -r localMachine Root
-%CertMgr% -del -c -sha1 F468B5F3FED807974476A22B32EA3137D924F7BA -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 F468B5F3FED807974476A22B32EA3137D924F7BA -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 F468B5F3FED807974476A22B32EA3137D924F7BA -s -r CurrentUser AuthRoot
-:: Fake *.hotmail.com(2015-01-17) [YFdyh000]
-%CertMgr% -del -c -sha1 75F411595FE9A21A17A4967C7B666E5152791A32 -s -r localMachine Root
-%CertMgr% -del -c -sha1 75F411595FE9A21A17A4967C7B666E5152791A32 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 75F411595FE9A21A17A4967C7B666E5152791A32 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 75F411595FE9A21A17A4967C7B666E5152791A32 -s -r CurrentUser AuthRoot
-:: CNNIC ROOT
-%CertMgr% -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s -r localMachine Root
-%CertMgr% -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s -r CurrentUser AuthRoot
-:: China Internet Network Information Center EV Certificates Root
-%CertMgr% -del -c -sha1 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E -s -r localMachine Root
-%CertMgr% -del -c -sha1 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E -s -r CurrentUser AuthRoot
-:: CNNIC SSL(Entrust)
-%CertMgr% -del -c -sha1 6856BB1A6C4F76DACA362187CC2CCD484EDDC25D -s -r localMachine CA
-%CertMgr% -del -c -sha1 6856BB1A6C4F76DACA362187CC2CCD484EDDC25D -s -r CurrentUser CA
-:: Baidu WACC service [SCFWSE]
-%CertMgr% -del -c -sha1 561422647B89BE22F203EBCAEF52B5007227510A -s -r localMachine CA
-%CertMgr% -del -c -sha1 561422647B89BE22F203EBCAEF52B5007227510A -s -r CurrentUser CA
-:: GiantRootCA
-%CertMgr% -del -c -sha1 7514436E903C901069980499CA70DE74FC06C83C -s -r localMachine Root
-%CertMgr% -del -c -sha1 7514436E903C901069980499CA70DE74FC06C83C -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 7514436E903C901069980499CA70DE74FC06C83C -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 7514436E903C901069980499CA70DE74FC06C83C -s -r CurrentUser AuthRoot
-:: JGZXCA
-%CertMgr% -del -c -sha1 7A4AA61E2A88704115E47748D8647DAEE6837559 -s -r localMachine Root
-%CertMgr% -del -c -sha1 7A4AA61E2A88704115E47748D8647DAEE6837559 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 7A4AA61E2A88704115E47748D8647DAEE6837559 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 7A4AA61E2A88704115E47748D8647DAEE6837559 -s -r CurrentUser AuthRoot
-:: Superfish, Inc. [Septembers/v998]
-%CertMgr% -del -c -sha1 C864484869D41D2B0D32319C5A62F9315AAF2CBD -s -r localMachine Root
-%CertMgr% -del -c -sha1 C864484869D41D2B0D32319C5A62F9315AAF2CBD -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 C864484869D41D2B0D32319C5A62F9315AAF2CBD -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 C864484869D41D2B0D32319C5A62F9315AAF2CBD -s -r CurrentUser AuthRoot
-
-@echo.
-
-:: Add certificates to CRL(Base part)
-%CertMgr% -add -c "%~dp0\Certs\[Fake]GitHubCom_201301.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Fake]GoogleCom_201407.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Fake]GoogleCom_201409.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Fake]YahooCom_201409.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Fake]HotmaiCom_201410.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Fake]WwwFacebookCom_201410.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Fake]WwwIcloudCom_201410.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Fake]AnyHotmailCom_201501.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\CNNIC_ROOT.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\China_Internet_Network_Information_Center_EV_Certificates_Root.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\CNNIC_SSL_Entrust.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Suspicious]WaccBaiduCom.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\GiantRootCA.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\JGZXCA.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\Superfish_Inc.crt" -s Disallowed
-
-:: Print to screen.
-@echo.
-@echo RevokeChinaCerts Base version
-@echo Done. Please confirm the messages on screen.
-@echo.
-@pause
diff --git a/Windows/RevokeChinaCerts_CodeSigning.bat b/Windows/RevokeChinaCerts_CodeSigning.bat
new file mode 100644
index 0000000..ccef188
--- /dev/null
+++ b/Windows/RevokeChinaCerts_CodeSigning.bat
@@ -0,0 +1,307 @@
+:: RevokeChinaCerts CodeSigning batch
+:: Revoke China Certificates.
+::
+:: Author: Chengr28
+::
+
+@echo off
+
+
+:: Locate folder, architecture check and choice
+cd /d %~dp0
+set CertMgr="%cd%\Tools\CertMgr"
+if %PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432% EQU x86 set CertMgr="%cd%\Tools\CertMgr_x86"
+set Folder=%cd%\Certs\CodeSigning
+set /a SetForce = 0
+set SetForceAppender="%cd%\Tools\SoftCertPolicyAppender\SoftCertPolicyAppender"
+@echo RevokeChinaCerts CodeSigning batch
+@echo.
+@echo Do you want to set force cetificates policy? [Y/N]
+@echo Setting force need Administrator permissions and Microsoft .NET Framework 4.0!
+set /p UserChoice="Choose: "
+if /i %UserChoice% EQU Y (set /a SetForce=1)
+@echo.
+@echo 1: Revoke CodeSigning cetificates
+@echo 2: Revoke CodeSigning cetificates(Choice version)
+@echo 3: Restore all CodeSigning revoking
+@echo.
+set /p UserChoice="Choose: "
+set UserChoice=CASE_%UserChoice%
+cls
+goto %UserChoice%
+
+
+:: All version
+:CASE_1
+:: WoSign Code Signing Authority(UTN-USERFirst-Object)
+%CertMgr% -add -c "%Folder%\WoSign_Code_Signing_Authority_UTN_USERFirst_Object.crt" -s Disallowed
+:: WoTrust Code Signing Authority(UTN-USERFirst-Object)
+%CertMgr% -add -c "%Folder%\WoTrust_Code_Signing_Authority_UTN_USERFirst_Object.crt" -s Disallowed
+:: 91.Com
+%CertMgr% -add -c "%Folder%\91Com.crt" -s Disallowed
+:: Baidu (China) Co., Ltd.
+%CertMgr% -add -c "%Folder%\Baidu_China_CoLtd.crt" -s Disallowed
+:: Beijing baidu Netcom science and technology co.ltd
+%CertMgr% -add -c "%Folder%\Beijing_Baidu_Netcom_Science_And_Technology_CoLtd.crt" -s Disallowed
+:: Beijing Baofeng Technology Co., Ltd.
+%CertMgr% -add -c "%Folder%\Beijing_Baofeng_Technology_CoLtd.crt" -s Disallowed
+:: Beijing Funshion Online Technologies Ltd.
+%CertMgr% -add -c "%Folder%\Beijing_Funshion_Online_Technologies_Ltd.crt" -s Disallowed
+:: Beijing Kingsoft Security software Co.,Ltd
+%CertMgr% -add -c "%Folder%\Beijing_Kingsoft_Security_Software_CoLtd.crt" -s Disallowed
+:: BEIJING KUWO TECHNOLOGY CO.,LTD.
+%CertMgr% -add -c "%Folder%\BEIJING_KUWO_TECHNOLOGY_COLTD.crt" -s Disallowed
+:: BEIJING QIYI CENTURY SCIENCE&TECHNOLOGY CO.,LTD.
+%CertMgr% -add -c "%Folder%\BEIJING_QIYI_CENTURY_SCIENCE_TECHNOLOGY_COLTD.crt" -s Disallowed
+:: Beijing Rising Information Technology Corporation Limited
+%CertMgr% -add -c "%Folder%\Beijing_Rising_Information_Technology_Corporation_Limited.crt" -s Disallowed
+:: Beijing Sohu New Media Information Technology Co., Ltd.
+%CertMgr% -add -c "%Folder%\Beijing_Sohu_New_Media_Information_Technology_CoLtd.crt" -s Disallowed
+:: Guangzhou Tieren Network Technology Co.,Ltd.
+%CertMgr% -add -c "%Folder%\Guangzhou_Tieren_Network_Technology_CoLtd.crt" -s Disallowed
+:: Kingsoft Security Co.,Ltd
+%CertMgr% -add -c "%Folder%\Kingsoft_Security_CoLtd.crt" -s Disallowed
+:: LE SHI INTERNET INFORMATION TECHNOLOGY CORP.,BEI JING
+%CertMgr% -add -c "%Folder%\LE_SHI_INTERNET_INFORMATION_TECHNOLOGY_CORP_BEIJING.crt" -s Disallowed
+:: Maxthon (Asia) Limited
+%CertMgr% -add -c "%Folder%\Maxthon_Asia_Limited.crt" -s Disallowed
+:: Meitu.Com
+%CertMgr% -add -c "%Folder%\MeituCom.crt" -s Disallowed
+:: NetEase(Hangzhou) Network Co. Ltd.
+%CertMgr% -add -c "%Folder%\NetEase_Hangzhou_Network_CoLtd.crt" -s Disallowed
+:: PPLive Corporation
+%CertMgr% -add -c "%Folder%\PPLive_Corporation.crt" -s Disallowed
+:: Qihoo 360 Software Beijing Company Limited
+%CertMgr% -add -c "%Folder%\Qihoo_360_Software_Beijing_Company_Limited.crt" -s Disallowed
+:: Shanghai Quan Tudou Network Technology Co., Ltd.
+%CertMgr% -add -c "%Folder%\Shanghai_Quan_Tudou_Network_Technology_CoLtd.crt" -s Disallowed
+:: ShenZhen Xunlei Networking Technologies Ltd.
+%CertMgr% -add -c "%Folder%\ShenZhen_Xunlei_Networking_Technologies_Ltd.crt" -s Disallowed
+:: TAOBAO (CHINA) SOFTWARE CO.,LTD.
+%CertMgr% -add -c "%Folder%\TAOBAO_CHINA_SOFTWARE_COLTD.crt" -s Disallowed
+:: Tencent Technology Shenzhen Company Limited
+%CertMgr% -add -c "%Folder%\Tencent_Technology_Shenzhen_Company_Limited.crt" -s Disallowed
+:: Tencent Technology Shenzhen Company Limited(2010-01-26)
+%CertMgr% -add -c "%Folder%\Tencent_Technology_Shenzhen_Company_Limited_201001.crt" -s Disallowed
+:: UC Mobile Limited
+%CertMgr% -add -c "%Folder%\UC_Mobile_Limited.crt" -s Disallowed
+:: Wandou Technology Ltd
+%CertMgr% -add -c "%Folder%\Wandou_Technology_Ltd.crt" -s Disallowed
+:: Xiamen Yitianxia Network Technology Co., Ltd
+%CertMgr% -add -c "%Folder%\Xiamen_Yitianxia_Network_Technology_CoLtd.crt" -s Disallowed
+:: Xiami.Com
+%CertMgr% -add -c "%Folder%\XiamiCom.crt" -s Disallowed
+:: Ylmf.Com
+%CertMgr% -add -c "%Folder%\YlmfCom.crt" -s Disallowed
+:: YY Inc
+%CertMgr% -add -c "%Folder%\YY_Inc.crt" -s Disallowed
+:: Set force
+@echo.
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\WoSign_Code_Signing_Authority_UTN_USERFirst_Object.crt" "%Folder%\WoTrust_Code_Signing_Authority_UTN_USERFirst_Object.crt" "%Folder%\91Com.crt" "%Folder%\Baidu_China_CoLtd.crt" "%Folder%\Beijing_Baidu_Netcom_Science_And_Technology_CoLtd.crt" "%Folder%\Beijing_Baofeng_Technology_CoLtd.crt" "%Folder%\Beijing_Funshion_Online_Technologies_Ltd.crt" "%Folder%\Beijing_Kingsoft_Security_Software_CoLtd.crt" "%Folder%\BEIJING_KUWO_TECHNOLOGY_COLTD.crt" "%Folder%\BEIJING_QIYI_CENTURY_SCIENCE_TECHNOLOGY_COLTD.crt" "%Folder%\Beijing_Rising_Information_Technology_Corporation_Limited.crt" "%Folder%\Beijing_Sohu_New_Media_Information_Technology_CoLtd.crt" "%Folder%\Guangzhou_Tieren_Network_Technology_CoLtd.crt" "%Folder%\Kingsoft_Security_CoLtd.crt" "%Folder%\LE_SHI_INTERNET_INFORMATION_TECHNOLOGY_CORP_BEIJING.crt" "%Folder%\Maxthon_Asia_Limited.crt" "%Folder%\MeituCom.crt" "%Folder%\NetEase_Hangzhou_Network_CoLtd.crt" "%Folder%\PPLive_Corporation.crt" "%Folder%\Qihoo_360_Software_Beijing_Company_Limited.crt" "%Folder%\Shanghai_Quan_Tudou_Network_Technology_CoLtd.crt" "%Folder%\ShenZhen_Xunlei_Networking_Technologies_Ltd.crt" "%Folder%\TAOBAO_CHINA_SOFTWARE_COLTD.crt" "%Folder%\Tencent_Technology_Shenzhen_Company_Limited.crt" "%Folder%\Tencent_Technology_Shenzhen_Company_Limited_201001.crt" "%Folder%\UC_Mobile_Limited.crt" "%Folder%\Wandou_Technology_Ltd.crt" "%Folder%\Xiamen_Yitianxia_Network_Technology_CoLtd.crt" "%Folder%\XiamiCom.crt" "%Folder%\YlmfCom.crt" "%Folder%\YY_Inc.crt")
+goto EXIT
+
+
+:: Choice version
+:CASE_2
+set /p UserChoice="Revoke WoSign Code Signing Authority(UTN-USERFirst-Object)? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\WoSign_Code_Signing_Authority_UTN_USERFirst_Object.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\WoSign_Code_Signing_Authority_UTN_USERFirst_Object.crt"))
+@echo.
+set /p UserChoice="Revoke WoTrust Code Signing Authority(UTN-USERFirst-Object)? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\WoTrust_Code_Signing_Authority_UTN_USERFirst_Object.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\WoTrust_Code_Signing_Authority_UTN_USERFirst_Object.crt"))
+@echo.
+set /p UserChoice="Revoke 91.Com? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\91Com.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\91Com.crt"))
+@echo.
+set /p UserChoice="Revoke Baidu (China) Co., Ltd.? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\Baidu_China_CoLtd.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\Baidu_China_CoLtd.crt"))
+@echo.
+set /p UserChoice="Revoke Beijing baidu Netcom science and technology co.ltd? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\Beijing_Baidu_Netcom_Science_And_Technology_CoLtd.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\Beijing_Baidu_Netcom_Science_And_Technology_CoLtd.crt"))
+@echo.
+set /p UserChoice="Revoke Beijing Baofeng Technology Co., Ltd.? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\Beijing_Baofeng_Technology_CoLtd.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\Beijing_Baofeng_Technology_CoLtd.crt"))
+@echo.
+set /p UserChoice="Revoke Beijing Funshion Online Technologies Ltd.? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\Beijing_Funshion_Online_Technologies_Ltd.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\Beijing_Funshion_Online_Technologies_Ltd.crt"))
+@echo.
+set /p UserChoice="Revoke Beijing Kingsoft Security software Co.,Ltd? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\Beijing_Kingsoft_Security_Software_CoLtd.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\Beijing_Kingsoft_Security_Software_CoLtd.crt"))
+@echo.
+set /p UserChoice="Revoke BEIJING KUWO TECHNOLOGY CO.,LTD.? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\BEIJING_KUWO_TECHNOLOGY_COLTD.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\BEIJING_KUWO_TECHNOLOGY_COLTD.crt"))
+@echo.
+set /p UserChoice="Revoke BEIJING QIYI CENTURY SCIENCE&TECHNOLOGY CO.,LTD.? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\BEIJING_QIYI_CENTURY_SCIENCE_TECHNOLOGY_COLTD.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\BEIJING_QIYI_CENTURY_SCIENCE_TECHNOLOGY_COLTD.crt"))
+@echo.
+set /p UserChoice="Revoke Beijing Rising Information Technology Corporation Limited? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\Beijing_Rising_Information_Technology_Corporation_Limited.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\Beijing_Rising_Information_Technology_Corporation_Limited.crt"))
+@echo.
+set /p UserChoice="Revoke Beijing Sohu New Media Information Technology Co., Ltd.? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\Beijing_Sohu_New_Media_Information_Technology_CoLtd.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\Beijing_Sohu_New_Media_Information_Technology_CoLtd.crt"))
+@echo.
+set /p UserChoice="Revoke Guangzhou Tieren Network Technology Co.,Ltd.? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\Guangzhou_Tieren_Network_Technology_CoLtd.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\Guangzhou_Tieren_Network_Technology_CoLtd.crt"))
+@echo.
+set /p UserChoice="Revoke Kingsoft Security Co.,Ltd? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\Kingsoft_Security_CoLtd.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\Kingsoft_Security_CoLtd.crt"))
+@echo.
+set /p UserChoice="Revoke LE SHI INTERNET INFORMATION TECHNOLOGY CORP.,BEI JING? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\LE_SHI_INTERNET_INFORMATION_TECHNOLOGY_CORP_BEIJING.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\LE_SHI_INTERNET_INFORMATION_TECHNOLOGY_CORP_BEIJING.crt"))
+@echo.
+set /p UserChoice="Revoke Maxthon (Asia) Limited? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\Maxthon_Asia_Limited.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\Maxthon_Asia_Limited.crt"))
+@echo.
+set /p UserChoice="Revoke Meitu.Com? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\MeituCom.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\MeituCom.crt"))
+@echo.
+set /p UserChoice="Revoke NetEase(Hangzhou) Network Co. Ltd.? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\NetEase_Hangzhou_Network_CoLtd.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\NetEase_Hangzhou_Network_CoLtd.crt"))
+@echo.
+set /p UserChoice="Revoke PPLive Corporation? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\PPLive_Corporation.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\PPLive_Corporation.crt"))
+@echo.
+set /p UserChoice="Revoke Qihoo 360 Software Beijing Company Limited? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\Qihoo_360_Software_Beijing_Company_Limited.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\Qihoo_360_Software_Beijing_Company_Limited.crt"))
+@echo.
+set /p UserChoice="Revoke Shanghai Quan Tudou Network Technology Co., Ltd.? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\Shanghai_Quan_Tudou_Network_Technology_CoLtd.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\Shanghai_Quan_Tudou_Network_Technology_CoLtd.crt"))
+@echo.
+set /p UserChoice="Revoke ShenZhen Xunlei Networking Technologies Ltd.? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\ShenZhen_Xunlei_Networking_Technologies_Ltd.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\ShenZhen_Xunlei_Networking_Technologies_Ltd.crt"))
+@echo.
+set /p UserChoice="Revoke TAOBAO (CHINA) SOFTWARE CO.,LTD.? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\TAOBAO_CHINA_SOFTWARE_COLTD.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\TAOBAO_CHINA_SOFTWARE_COLTD.crt"))
+@echo.
+set /p UserChoice="Revoke Tencent Technology Shenzhen Company Limited? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\Tencent_Technology_Shenzhen_Company_Limited.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\Tencent_Technology_Shenzhen_Company_Limited.crt"))
+@echo.
+set /p UserChoice="Revoke Tencent Technology Shenzhen Company Limited(2010-01-26)? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\Tencent_Technology_Shenzhen_Company_Limited_201001.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\Tencent_Technology_Shenzhen_Company_Limited_201001.crt"))
+@echo.
+set /p UserChoice="Revoke UC Mobile Limited? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\UC_Mobile_Limited.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\UC_Mobile_Limited.crt"))
+@echo.
+set /p UserChoice="Revoke Wandou Technology Ltd? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\Wandou_Technology_Ltd.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\Wandou_Technology_Ltd.crt"))
+@echo.
+set /p UserChoice="Revoke Xiamen Yitianxia Network Technology Co., Ltd? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\Xiamen_Yitianxia_Network_Technology_CoLtd.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\Xiamen_Yitianxia_Network_Technology_CoLtd.crt"))
+@echo.
+set /p UserChoice="Revoke Xiami.Com? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\XiamiCom.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\XiamiCom.crt"))
+@echo.
+set /p UserChoice="Revoke Ylmf.Com? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\YlmfCom.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\YlmfCom.crt"))
+@echo.
+set /p UserChoice="Revoke YY Inc? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\YY_Inc.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\YY_Inc.crt"))
+goto EXIT
+
+
+:: Restore certificates
+:CASE_3
+:: WoSign Code Signing Authority(UTN-USERFirst-Object)
+%CertMgr% -del -c -sha1 EA36152981E296F9763E1DC74B3262D3928563F8 -s Disallowed
+:: WoTrust Code Signing Authority(UTN-USERFirst-Object)
+%CertMgr% -del -c -sha1 B28CCC46D234A7D7CF7F21CCB9406F48A5273CC6 -s Disallowed
+:: 91.Com
+%CertMgr% -del -c -sha1 E87D1C1D3FE2BCA700EB7B8DC0E45B97EAF19405 -s Disallowed
+:: Baidu (China) Co., Ltd.
+%CertMgr% -del -c -sha1 A34B70840C2B6F718877DDB1C2DE2C27F2C91C43 -s Disallowed
+:: Beijing baidu Netcom science and technology co.ltd
+%CertMgr% -del -c -sha1 D60C12D1FDB9E45551A00C8815CCD486C043945B -s Disallowed
+:: Beijing Baofeng Technology Co., Ltd.
+%CertMgr% -del -c -sha1 CB6F65314E5B25D61304AB2C9C8870B574CC21F5 -s Disallowed
+:: Beijing Funshion Online Technologies Ltd.
+%CertMgr% -del -c -sha1 9AB5445104C6CCE5A22431CF29C4331CBC328A1B -s Disallowed
+:: Beijing Kingsoft Security software Co.,Ltd
+%CertMgr% -del -c -sha1 E88DD1ACD2DB3A352072AA49C675F4944A3FEF82 -s Disallowed
+:: BEIJING KUWO TECHNOLOGY CO.,LTD.
+%CertMgr% -del -c -sha1 5FFFD1A3EAE5ED74558913C4A8476D1514C6D61F -s Disallowed
+:: BEIJING QIYI CENTURY SCIENCE&TECHNOLOGY CO.,LTD.
+%CertMgr% -del -c -sha1 5DC57AF121E3101F4BFEA8A22BBDADC0869C80EE -s Disallowed
+:: Beijing Rising Information Technology Corporation Limited
+%CertMgr% -del -c -sha1 D9421BEDD9F5B8A91DD3F8691E7A42D83C983325 -s Disallowed
+:: Beijing Sohu New Media Information Technology Co., Ltd.
+%CertMgr% -del -c -sha1 D1BB252CAC3D250C55978F7EAAF121DA91A17B42 -s Disallowed
+:: Guangzhou Tieren Network Technology Co.,Ltd.
+%CertMgr% -del -c -sha1 2529C0C0D833806AFBFA3C31987C19A18722A2FE -s Disallowed
+:: Kingsoft Security Co.,Ltd
+%CertMgr% -del -c -sha1 2BDEC50B4446652C126709A08248E572B859CCCC -s Disallowed
+:: LE SHI INTERNET INFORMATION TECHNOLOGY CORP.,BEI JING
+%CertMgr% -del -c -sha1 62DF2BC4B5902B52C215C697D06038E3B28CF5D3 -s Disallowed
+:: Maxthon (Asia) Limited
+%CertMgr% -del -c -sha1 1481414E8E87412A00D3341167FE3A92C681B830 -s Disallowed
+:: Meitu.Com
+%CertMgr% -del -c -sha1 7B6FAE77BD19FEC5410293344B36124774A6D8F1 -s Disallowed
+:: NetEase(Hangzhou) Network Co. Ltd.
+%CertMgr% -del -c -sha1 E0387F3AF5752A4620EC617C39153C0E666CF5F8 -s Disallowed
+:: PPLive Corporation
+%CertMgr% -del -c -sha1 5477E38783CD37B1E5729B15D7C0873A2D72DB9D -s Disallowed
+:: Qihoo 360 Software Beijing Company Limited
+%CertMgr% -del -c -sha1 1E5BB77FCB63F26277F95AAE09B852699327A08A -s Disallowed
+:: Shanghai Quan Tudou Network Technology Co., Ltd.
+%CertMgr% -del -c -sha1 935140881F50BDF775D3CEF034C0D21C18FD2567 -s Disallowed
+:: ShenZhen Xunlei Networking Technologies Ltd.
+%CertMgr% -del -c -sha1 4099665730474153EADF671B8B475C03C08A46D0 -s Disallowed
+:: TAOBAO (CHINA) SOFTWARE CO.,LTD.
+%CertMgr% -del -c -sha1 E5777A69CAFD7F7C6F89C5297DD1159C7AE9B881 -s Disallowed
+:: Tencent Technology Shenzhen Company Limited
+%CertMgr% -del -c -sha1 2FDD445591CD2EEDBEF8B8A281896A59C08B3DC9 -s Disallowed
+:: Tencent Technology Shenzhen Company Limited(2010-01-26)
+%CertMgr% -del -c -sha1 8B46390D86B891E5A3D3AAB2B00D6FDB27A0F791 -s Disallowed
+:: UC Mobile Limited
+%CertMgr% -del -c -sha1 1540C77B5D19FC5A71A04DB001488E55B45DDC7F -s Disallowed
+:: Wandou Technology Ltd
+%CertMgr% -del -c -sha1 AB09D1AFE555CFC580575F5BC78B16B9F1C4E432 -s Disallowed
+:: Xiamen Yitianxia Network Technology Co., Ltd
+%CertMgr% -del -c -sha1 F49A648C69C2F01A0FDEB3992C5AE0A14D5AD9FC -s Disallowed
+:: Xiami.Com
+%CertMgr% -del -c -sha1 EEC507F719D5BA0CB913F034E045A24A509D8A5F -s Disallowed
+:: Ylmf.Com
+%CertMgr% -del -c -sha1 93A77CA50F165A5873DD3995874867B616AB3644 -s Disallowed
+:: YY Inc
+%CertMgr% -del -c -sha1 B3B89CD7940DC67E4291A3EE767AC17A3BC9E620 -s Disallowed
+:: Unset force
+@echo.
+if %SetForce% EQU 1 (%SetForceAppender% -r --unset-force "%Folder%\WoSign_Code_Signing_Authority_UTN_USERFirst_Object.crt" "%Folder%\WoTrust_Code_Signing_Authority_UTN_USERFirst_Object.crt" "%Folder%\91Com.crt" "%Folder%\Baidu_China_CoLtd.crt" "%Folder%\Beijing_Baidu_Netcom_Science_And_Technology_CoLtd.crt" "%Folder%\Beijing_Baofeng_Technology_CoLtd.crt" "%Folder%\Beijing_Funshion_Online_Technologies_Ltd.crt" "%Folder%\Beijing_Kingsoft_Security_Software_CoLtd.crt" "%Folder%\BEIJING_KUWO_TECHNOLOGY_COLTD.crt" "%Folder%\BEIJING_QIYI_CENTURY_SCIENCE_TECHNOLOGY_COLTD.crt" "%Folder%\Beijing_Rising_Information_Technology_Corporation_Limited.crt" "%Folder%\Beijing_Sohu_New_Media_Information_Technology_CoLtd.crt" "%Folder%\Guangzhou_Tieren_Network_Technology_CoLtd.crt" "%Folder%\Kingsoft_Security_CoLtd.crt" "%Folder%\LE_SHI_INTERNET_INFORMATION_TECHNOLOGY_CORP_BEIJING.crt" "%Folder%\Maxthon_Asia_Limited.crt" "%Folder%\MeituCom.crt" "%Folder%\NetEase_Hangzhou_Network_CoLtd.crt" "%Folder%\PPLive_Corporation.crt" "%Folder%\Qihoo_360_Software_Beijing_Company_Limited.crt" "%Folder%\Shanghai_Quan_Tudou_Network_Technology_CoLtd.crt" "%Folder%\ShenZhen_Xunlei_Networking_Technologies_Ltd.crt" "%Folder%\TAOBAO_CHINA_SOFTWARE_COLTD.crt" "%Folder%\Tencent_Technology_Shenzhen_Company_Limited.crt" "%Folder%\Tencent_Technology_Shenzhen_Company_Limited_201001.crt" "%Folder%\UC_Mobile_Limited.crt" "%Folder%\Wandou_Technology_Ltd.crt" "%Folder%\Xiamen_Yitianxia_Network_Technology_CoLtd.crt" "%Folder%\XiamiCom.crt" "%Folder%\YlmfCom.crt" "%Folder%\YY_Inc.crt")
+
+
+:: Print to screen.
+:EXIT
+@echo.
+@echo RevokeChinaCerts CodeSigning batch
+@echo Done, please confirm the messages on screen.
+@echo.
+@pause
diff --git a/Windows/RevokeChinaCerts_Extended.bat b/Windows/RevokeChinaCerts_Extended.bat
deleted file mode 100644
index fcbd832..0000000
--- a/Windows/RevokeChinaCerts_Extended.bat
+++ /dev/null
@@ -1,179 +0,0 @@
-:: RevokeChinaCerts Extended batch
-:: Revoke China Certificates.
-::
-:: Author: JayXon, Chengr28
-::
-
-@echo off
-
-:: Update certificates list of system.
-cd /d %~dp0
-"%~dp0\Tools\RootSUPD_201403_x86"
-
-:: Architecture check
-set CertMgr="%~dp0\Tools\CertMgr"
-if "%PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432%" == "x86" set CertMgr="%~dp0\Tools\CertMgr_x86"
-
-:: Delete certificates(Base part)
-:: Fake github.com(2013-01-25)
-%CertMgr% -del -c -sha1 27A29C3A8B3261770E8B59448557DC9E9339E68C -s -r localMachine Root
-%CertMgr% -del -c -sha1 27A29C3A8B3261770E8B59448557DC9E9339E68C -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 27A29C3A8B3261770E8B59448557DC9E9339E68C -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 27A29C3A8B3261770E8B59448557DC9E9339E68C -s -r CurrentUser AuthRoot
-:: Fake google.com(2014-07-24)
-%CertMgr% -del -c -sha1 F6BEADB9BC02E0A152D71C318739CDECFC1C085D -s -r localMachine Root
-%CertMgr% -del -c -sha1 F6BEADB9BC02E0A152D71C318739CDECFC1C085D -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 F6BEADB9BC02E0A152D71C318739CDECFC1C085D -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 F6BEADB9BC02E0A152D71C318739CDECFC1C085D -s -r CurrentUser AuthRoot
-:: Fake google.com(2014-09-18) [YFdyh000]
-%CertMgr% -del -c -sha1 316076F2866588DBB233C7F9EB68B58125150C21 -s -r localMachine Root
-%CertMgr% -del -c -sha1 316076F2866588DBB233C7F9EB68B58125150C21 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 316076F2866588DBB233C7F9EB68B58125150C21 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 316076F2866588DBB233C7F9EB68B58125150C21 -s -r CurrentUser AuthRoot
-:: Fake yahoo.com(2014-09-30)
-%CertMgr% -del -c -sha1 2290C311EA0F3F57E06DF45B698E18E828E59BC3 -s -r localMachine Root
-%CertMgr% -del -c -sha1 2290C311EA0F3F57E06DF45B698E18E828E59BC3 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 2290C311EA0F3F57E06DF45B698E18E828E59BC3 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 2290C311EA0F3F57E06DF45B698E18E828E59BC3 -s -r CurrentUser AuthRoot
-:: Fake hotmai.com(2014-10-02)
-%CertMgr% -del -c -sha1 30F3B3ADC6E570BDA606B9F96DE24190CE262C67 -s -r localMachine Root
-%CertMgr% -del -c -sha1 30F3B3ADC6E570BDA606B9F96DE24190CE262C67 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 30F3B3ADC6E570BDA606B9F96DE24190CE262C67 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 30F3B3ADC6E570BDA606B9F96DE24190CE262C67 -s -r CurrentUser AuthRoot
-:: Fake www.facebook.com(2014-10-08) [Yiwen Zhang]
-%CertMgr% -del -c -sha1 DC6EE6EDC4C078E1B2C12F6D1985000E27CFD318 -s -r localMachine Root
-%CertMgr% -del -c -sha1 DC6EE6EDC4C078E1B2C12F6D1985000E27CFD318 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 DC6EE6EDC4C078E1B2C12F6D1985000E27CFD318 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 DC6EE6EDC4C078E1B2C12F6D1985000E27CFD318 -s -r CurrentUser AuthRoot
-:: Fake www.icound.com(2014-10-04) [YFdyh000]
-%CertMgr% -del -c -sha1 F468B5F3FED807974476A22B32EA3137D924F7BA -s -r localMachine Root
-%CertMgr% -del -c -sha1 F468B5F3FED807974476A22B32EA3137D924F7BA -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 F468B5F3FED807974476A22B32EA3137D924F7BA -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 F468B5F3FED807974476A22B32EA3137D924F7BA -s -r CurrentUser AuthRoot
-:: Fake *.hotmail.com(2015-01-17) [YFdyh000]
-%CertMgr% -del -c -sha1 75F411595FE9A21A17A4967C7B666E5152791A32 -s -r localMachine Root
-%CertMgr% -del -c -sha1 75F411595FE9A21A17A4967C7B666E5152791A32 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 75F411595FE9A21A17A4967C7B666E5152791A32 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 75F411595FE9A21A17A4967C7B666E5152791A32 -s -r CurrentUser AuthRoot
-:: CNNIC ROOT
-%CertMgr% -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s -r localMachine Root
-%CertMgr% -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s -r CurrentUser AuthRoot
-:: China Internet Network Information Center EV Certificates Root
-%CertMgr% -del -c -sha1 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E -s -r localMachine Root
-%CertMgr% -del -c -sha1 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E -s -r CurrentUser AuthRoot
-:: CNNIC SSL(Entrust)
-%CertMgr% -del -c -sha1 6856BB1A6C4F76DACA362187CC2CCD484EDDC25D -s -r localMachine CA
-%CertMgr% -del -c -sha1 6856BB1A6C4F76DACA362187CC2CCD484EDDC25D -s -r CurrentUser CA
-:: Baidu WACC service [SCFWSE]
-%CertMgr% -del -c -sha1 561422647B89BE22F203EBCAEF52B5007227510A -s -r localMachine CA
-%CertMgr% -del -c -sha1 561422647B89BE22F203EBCAEF52B5007227510A -s -r CurrentUser CA
-:: GiantRootCA
-%CertMgr% -del -c -sha1 7514436E903C901069980499CA70DE74FC06C83C -s -r localMachine Root
-%CertMgr% -del -c -sha1 7514436E903C901069980499CA70DE74FC06C83C -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 7514436E903C901069980499CA70DE74FC06C83C -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 7514436E903C901069980499CA70DE74FC06C83C -s -r CurrentUser AuthRoot
-:: JGZXCA
-%CertMgr% -del -c -sha1 7A4AA61E2A88704115E47748D8647DAEE6837559 -s -r localMachine Root
-%CertMgr% -del -c -sha1 7A4AA61E2A88704115E47748D8647DAEE6837559 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 7A4AA61E2A88704115E47748D8647DAEE6837559 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 7A4AA61E2A88704115E47748D8647DAEE6837559 -s -r CurrentUser AuthRoot
-:: Superfish, Inc. [Septembers/v998]
-%CertMgr% -del -c -sha1 C864484869D41D2B0D32319C5A62F9315AAF2CBD -s -r localMachine Root
-%CertMgr% -del -c -sha1 C864484869D41D2B0D32319C5A62F9315AAF2CBD -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 C864484869D41D2B0D32319C5A62F9315AAF2CBD -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 C864484869D41D2B0D32319C5A62F9315AAF2CBD -s -r CurrentUser AuthRoot
-
-:: Delete certificates(Extended part)
-:: CFCA GT CA(2011-06-13)
-%CertMgr% -del -c -sha1 EABDA240440ABBD694930A01D09764C6C2D77966 -s -r localMachine Root
-%CertMgr% -del -c -sha1 EABDA240440ABBD694930A01D09764C6C2D77966 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 EABDA240440ABBD694930A01D09764C6C2D77966 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 EABDA240440ABBD694930A01D09764C6C2D77966 -s -r CurrentUser AuthRoot
-:: CFCA GT CA(2012-08-21) [YFdyh000]
-%CertMgr% -del -c -sha1 A8F2DFE36AE0CC2DB9DD38347D30AED9551DD25A -s -r localMachine Root
-%CertMgr% -del -c -sha1 A8F2DFE36AE0CC2DB9DD38347D30AED9551DD25A -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 A8F2DFE36AE0CC2DB9DD38347D30AED9551DD25A -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 A8F2DFE36AE0CC2DB9DD38347D30AED9551DD25A -s -r CurrentUser AuthRoot
-:: CFCA EV ROOT
-%CertMgr% -del -c -sha1 E2B8294B5584AB6B58C290466CAC3FB8398F8483 -s -r localMachine Root
-%CertMgr% -del -c -sha1 E2B8294B5584AB6B58C290466CAC3FB8398F8483 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 E2B8294B5584AB6B58C290466CAC3FB8398F8483 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 E2B8294B5584AB6B58C290466CAC3FB8398F8483 -s -r CurrentUser AuthRoot
-:: UCA Global Root
-%CertMgr% -del -c -sha1 0B972C9EA6E7CC58D93B20BF71EC412E7209FABF -s -r localMachine Root
-%CertMgr% -del -c -sha1 0B972C9EA6E7CC58D93B20BF71EC412E7209FABF -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 0B972C9EA6E7CC58D93B20BF71EC412E7209FABF -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 0B972C9EA6E7CC58D93B20BF71EC412E7209FABF -s -r CurrentUser AuthRoot
-:: UCA Root(2004-01-01)
-%CertMgr% -del -c -sha1 8250BED5A214433A66377CBC10EF83F669DA3A67 -s -r localMachine Root
-%CertMgr% -del -c -sha1 8250BED5A214433A66377CBC10EF83F669DA3A67 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 8250BED5A214433A66377CBC10EF83F669DA3A67 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 8250BED5A214433A66377CBC10EF83F669DA3A67 -s -r CurrentUser AuthRoot
-:: UCA Extended Validation Root
-%CertMgr% -del -c -sha1 B9C9F58B3BBEF575E2B58328770E7B0076C40B5E -s -r localMachine Root
-%CertMgr% -del -c -sha1 B9C9F58B3BBEF575E2B58328770E7B0076C40B5E -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 B9C9F58B3BBEF575E2B58328770E7B0076C40B5E -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 B9C9F58B3BBEF575E2B58328770E7B0076C40B5E -s -r CurrentUser AuthRoot
-:: UCA ROOT(2001-01-01)
-%CertMgr% -del -c -sha1 3120F295417730075F8CD42D0CAE008EB5726EF8 -s -r localMachine Root
-%CertMgr% -del -c -sha1 3120F295417730075F8CD42D0CAE008EB5726EF8 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 3120F295417730075F8CD42D0CAE008EB5726EF8 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 3120F295417730075F8CD42D0CAE008EB5726EF8 -s -r CurrentUser AuthRoot
-:: GoAgent CA [lenovo-me]
-%CertMgr% -del -c -sha1 AB702CDF18EBE8B438C52869CD4A5DEF48B40E33 -s -r localMachine Root
-%CertMgr% -del -c -sha1 AB702CDF18EBE8B438C52869CD4A5DEF48B40E33 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 AB702CDF18EBE8B438C52869CD4A5DEF48B40E33 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 AB702CDF18EBE8B438C52869CD4A5DEF48B40E33 -s -r CurrentUser AuthRoot
-:: SZCA [yfdyh000]
-::%CertMgr% -del -c -sha1 B0049D436F27237EE59C746A1EF3C96A8E1B54AC -s -r localMachine Root
-::%CertMgr% -del -c -sha1 B0049D436F27237EE59C746A1EF3C96A8E1B54AC -s -r localMachine AuthRoot
-::%CertMgr% -del -c -sha1 B0049D436F27237EE59C746A1EF3C96A8E1B54AC -s -r CurrentUser Root
-::%CertMgr% -del -c -sha1 B0049D436F27237EE59C746A1EF3C96A8E1B54AC -s -r CurrentUser AuthRoot
-:: SZCA(2003-07-22) [yfdyh000]
-::%CertMgr% -del -c -sha1 90D7A97592F0A3E2165DE5DA23B57701D74A298D -s -r localMachine Root
-::%CertMgr% -del -c -sha1 90D7A97592F0A3E2165DE5DA23B57701D74A298D -s -r localMachine AuthRoot
-::%CertMgr% -del -c -sha1 90D7A97592F0A3E2165DE5DA23B57701D74A298D -s -r CurrentUser Root
-::%CertMgr% -del -c -sha1 90D7A97592F0A3E2165DE5DA23B57701D74A298D -s -r CurrentUser AuthRoot
-
-@echo.
-
-:: Add certificates to CRL(Base part)
-%CertMgr% -add -c "%~dp0\Certs\[Fake]GitHubCom_201301.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Fake]GoogleCom_201407.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Fake]GoogleCom_201409.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Fake]YahooCom_201409.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Fake]HotmaiCom_201410.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Fake]WwwFacebookCom_201410.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Fake]WwwIcloudCom_201410.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Fake]AnyHotmailCom_201501.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\CNNIC_ROOT.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\China_Internet_Network_Information_Center_EV_Certificates_Root.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\CNNIC_SSL_Entrust.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Suspicious]WaccBaiduCom.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\GiantRootCA.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\JGZXCA.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\Superfish_Inc.crt" -s Disallowed
-
-:: Add certificates to CRL(Extended part)
-::%CertMgr% -add -c ROOTCA.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\CFCA_GT_CA_201106.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\CFCA_GT_CA_201208.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\CFCA_EV_ROOT.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\UCA_Global_Root.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\UCA_Root_200401.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\UCA_Extended_Validation_Root.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\UCA_ROOT_200101.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Suspicious]GoAgent_CA.crt" -s Disallowed
-::%CertMgr% -add -c "%~dp0\Certs\SZCA.crt" -s Disallowed
-::%CertMgr% -add -c "%~dp0\Certs\SZCA_200307.crt" -s Disallowed
-
-:: Print to screen.
-@echo.
-@echo RevokeChinaCerts Extended version
-@echo Done. Please confirm the messages on screen.
-@echo.
-@pause
diff --git a/Windows/RevokeChinaCerts_All.bat b/Windows/RevokeChinaCerts_Online.bat
similarity index 62%
rename from Windows/RevokeChinaCerts_All.bat
rename to Windows/RevokeChinaCerts_Online.bat
index 0f4bc03..de5d442 100644
--- a/Windows/RevokeChinaCerts_All.bat
+++ b/Windows/RevokeChinaCerts_Online.bat
@@ -1,4 +1,4 @@
-:: RevokeChinaCerts All batch
+:: RevokeChinaCerts Online batch
:: Revoke China Certificates.
::
:: Author: JayXon, Chengr28
@@ -6,145 +6,28 @@
@echo off
-:: Update certificates list of system.
-cd /d %~dp0
-"%~dp0\Tools\RootSUPD_201403_x86"
-:: Architecture check
+:: Locate folder, architecture check, choice and update certificates
+cd /d %~dp0
set CertMgr="%~dp0\Tools\CertMgr"
-if "%PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432%" == "x86" set CertMgr="%~dp0\Tools\CertMgr_x86"
-
-:: Delete certificates(Base part)
-:: Fake github.com(2013-01-25)
-%CertMgr% -del -c -sha1 27A29C3A8B3261770E8B59448557DC9E9339E68C -s -r localMachine Root
-%CertMgr% -del -c -sha1 27A29C3A8B3261770E8B59448557DC9E9339E68C -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 27A29C3A8B3261770E8B59448557DC9E9339E68C -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 27A29C3A8B3261770E8B59448557DC9E9339E68C -s -r CurrentUser AuthRoot
-:: Fake google.com(2014-07-24)
-%CertMgr% -del -c -sha1 F6BEADB9BC02E0A152D71C318739CDECFC1C085D -s -r localMachine Root
-%CertMgr% -del -c -sha1 F6BEADB9BC02E0A152D71C318739CDECFC1C085D -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 F6BEADB9BC02E0A152D71C318739CDECFC1C085D -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 F6BEADB9BC02E0A152D71C318739CDECFC1C085D -s -r CurrentUser AuthRoot
-:: Fake google.com(2014-09-18) [YFdyh000]
-%CertMgr% -del -c -sha1 316076F2866588DBB233C7F9EB68B58125150C21 -s -r localMachine Root
-%CertMgr% -del -c -sha1 316076F2866588DBB233C7F9EB68B58125150C21 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 316076F2866588DBB233C7F9EB68B58125150C21 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 316076F2866588DBB233C7F9EB68B58125150C21 -s -r CurrentUser AuthRoot
-:: Fake yahoo.com(2014-09-30)
-%CertMgr% -del -c -sha1 2290C311EA0F3F57E06DF45B698E18E828E59BC3 -s -r localMachine Root
-%CertMgr% -del -c -sha1 2290C311EA0F3F57E06DF45B698E18E828E59BC3 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 2290C311EA0F3F57E06DF45B698E18E828E59BC3 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 2290C311EA0F3F57E06DF45B698E18E828E59BC3 -s -r CurrentUser AuthRoot
-:: Fake hotmai.com(2014-10-02)
-%CertMgr% -del -c -sha1 30F3B3ADC6E570BDA606B9F96DE24190CE262C67 -s -r localMachine Root
-%CertMgr% -del -c -sha1 30F3B3ADC6E570BDA606B9F96DE24190CE262C67 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 30F3B3ADC6E570BDA606B9F96DE24190CE262C67 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 30F3B3ADC6E570BDA606B9F96DE24190CE262C67 -s -r CurrentUser AuthRoot
-:: Fake www.facebook.com(2014-10-08) [Yiwen Zhang]
-%CertMgr% -del -c -sha1 DC6EE6EDC4C078E1B2C12F6D1985000E27CFD318 -s -r localMachine Root
-%CertMgr% -del -c -sha1 DC6EE6EDC4C078E1B2C12F6D1985000E27CFD318 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 DC6EE6EDC4C078E1B2C12F6D1985000E27CFD318 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 DC6EE6EDC4C078E1B2C12F6D1985000E27CFD318 -s -r CurrentUser AuthRoot
-:: Fake www.icound.com(2014-10-04) [YFdyh000]
-%CertMgr% -del -c -sha1 F468B5F3FED807974476A22B32EA3137D924F7BA -s -r localMachine Root
-%CertMgr% -del -c -sha1 F468B5F3FED807974476A22B32EA3137D924F7BA -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 F468B5F3FED807974476A22B32EA3137D924F7BA -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 F468B5F3FED807974476A22B32EA3137D924F7BA -s -r CurrentUser AuthRoot
-:: Fake *.hotmail.com(2015-01-17) [YFdyh000]
-%CertMgr% -del -c -sha1 75F411595FE9A21A17A4967C7B666E5152791A32 -s -r localMachine Root
-%CertMgr% -del -c -sha1 75F411595FE9A21A17A4967C7B666E5152791A32 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 75F411595FE9A21A17A4967C7B666E5152791A32 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 75F411595FE9A21A17A4967C7B666E5152791A32 -s -r CurrentUser AuthRoot
-:: CNNIC ROOT
-%CertMgr% -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s -r localMachine Root
-%CertMgr% -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s -r CurrentUser AuthRoot
-:: China Internet Network Information Center EV Certificates Root
-%CertMgr% -del -c -sha1 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E -s -r localMachine Root
-%CertMgr% -del -c -sha1 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E -s -r CurrentUser AuthRoot
-:: CNNIC SSL(Entrust)
-%CertMgr% -del -c -sha1 6856BB1A6C4F76DACA362187CC2CCD484EDDC25D -s -r localMachine CA
-%CertMgr% -del -c -sha1 6856BB1A6C4F76DACA362187CC2CCD484EDDC25D -s -r CurrentUser CA
-:: Baidu WACC service [SCFWSE]
-%CertMgr% -del -c -sha1 561422647B89BE22F203EBCAEF52B5007227510A -s -r localMachine CA
-%CertMgr% -del -c -sha1 561422647B89BE22F203EBCAEF52B5007227510A -s -r CurrentUser CA
-:: GiantRootCA
-%CertMgr% -del -c -sha1 7514436E903C901069980499CA70DE74FC06C83C -s -r localMachine Root
-%CertMgr% -del -c -sha1 7514436E903C901069980499CA70DE74FC06C83C -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 7514436E903C901069980499CA70DE74FC06C83C -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 7514436E903C901069980499CA70DE74FC06C83C -s -r CurrentUser AuthRoot
-:: JGZXCA
-%CertMgr% -del -c -sha1 7A4AA61E2A88704115E47748D8647DAEE6837559 -s -r localMachine Root
-%CertMgr% -del -c -sha1 7A4AA61E2A88704115E47748D8647DAEE6837559 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 7A4AA61E2A88704115E47748D8647DAEE6837559 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 7A4AA61E2A88704115E47748D8647DAEE6837559 -s -r CurrentUser AuthRoot
-:: Superfish, Inc. [Septembers/v998]
-%CertMgr% -del -c -sha1 C864484869D41D2B0D32319C5A62F9315AAF2CBD -s -r localMachine Root
-%CertMgr% -del -c -sha1 C864484869D41D2B0D32319C5A62F9315AAF2CBD -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 C864484869D41D2B0D32319C5A62F9315AAF2CBD -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 C864484869D41D2B0D32319C5A62F9315AAF2CBD -s -r CurrentUser AuthRoot
+if %PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432% EQU x86 set CertMgr="%~dp0\Tools\CertMgr_x86"
+set Folder=%cd%\Certs\Online
+@echo RevokeChinaCerts Online batch
+@echo.
+@echo 1: Base version
+@echo 2: Extended version
+@echo 3: All version
+@echo 4: Restore all Online revoking
+@echo.
+set /p UserChoice="Choose: "
+if %UserChoice% GTR 0 (if %UserChoice% LEQ 4 ("%~dp0\Tools\RootSUPD_201403_x86"))
+set UserChoice=CASE_%UserChoice%
+cls
+goto %UserChoice%
-:: Delete certificates(Extended part)
-:: CFCA GT CA(2011-06-13)
-%CertMgr% -del -c -sha1 EABDA240440ABBD694930A01D09764C6C2D77966 -s -r localMachine Root
-%CertMgr% -del -c -sha1 EABDA240440ABBD694930A01D09764C6C2D77966 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 EABDA240440ABBD694930A01D09764C6C2D77966 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 EABDA240440ABBD694930A01D09764C6C2D77966 -s -r CurrentUser AuthRoot
-:: CFCA GT CA(2012-08-21) [YFdyh000]
-%CertMgr% -del -c -sha1 A8F2DFE36AE0CC2DB9DD38347D30AED9551DD25A -s -r localMachine Root
-%CertMgr% -del -c -sha1 A8F2DFE36AE0CC2DB9DD38347D30AED9551DD25A -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 A8F2DFE36AE0CC2DB9DD38347D30AED9551DD25A -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 A8F2DFE36AE0CC2DB9DD38347D30AED9551DD25A -s -r CurrentUser AuthRoot
-:: CFCA EV ROOT
-%CertMgr% -del -c -sha1 E2B8294B5584AB6B58C290466CAC3FB8398F8483 -s -r localMachine Root
-%CertMgr% -del -c -sha1 E2B8294B5584AB6B58C290466CAC3FB8398F8483 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 E2B8294B5584AB6B58C290466CAC3FB8398F8483 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 E2B8294B5584AB6B58C290466CAC3FB8398F8483 -s -r CurrentUser AuthRoot
-:: UCA Global Root
-%CertMgr% -del -c -sha1 0B972C9EA6E7CC58D93B20BF71EC412E7209FABF -s -r localMachine Root
-%CertMgr% -del -c -sha1 0B972C9EA6E7CC58D93B20BF71EC412E7209FABF -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 0B972C9EA6E7CC58D93B20BF71EC412E7209FABF -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 0B972C9EA6E7CC58D93B20BF71EC412E7209FABF -s -r CurrentUser AuthRoot
-:: UCA Root(2004-01-01)
-%CertMgr% -del -c -sha1 8250BED5A214433A66377CBC10EF83F669DA3A67 -s -r localMachine Root
-%CertMgr% -del -c -sha1 8250BED5A214433A66377CBC10EF83F669DA3A67 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 8250BED5A214433A66377CBC10EF83F669DA3A67 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 8250BED5A214433A66377CBC10EF83F669DA3A67 -s -r CurrentUser AuthRoot
-:: UCA Extended Validation Root
-%CertMgr% -del -c -sha1 B9C9F58B3BBEF575E2B58328770E7B0076C40B5E -s -r localMachine Root
-%CertMgr% -del -c -sha1 B9C9F58B3BBEF575E2B58328770E7B0076C40B5E -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 B9C9F58B3BBEF575E2B58328770E7B0076C40B5E -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 B9C9F58B3BBEF575E2B58328770E7B0076C40B5E -s -r CurrentUser AuthRoot
-:: UCA ROOT(2001-01-01)
-%CertMgr% -del -c -sha1 3120F295417730075F8CD42D0CAE008EB5726EF8 -s -r localMachine Root
-%CertMgr% -del -c -sha1 3120F295417730075F8CD42D0CAE008EB5726EF8 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 3120F295417730075F8CD42D0CAE008EB5726EF8 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 3120F295417730075F8CD42D0CAE008EB5726EF8 -s -r CurrentUser AuthRoot
-:: GoAgent CA [lenovo-me]
-%CertMgr% -del -c -sha1 AB702CDF18EBE8B438C52869CD4A5DEF48B40E33 -s -r localMachine Root
-%CertMgr% -del -c -sha1 AB702CDF18EBE8B438C52869CD4A5DEF48B40E33 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 AB702CDF18EBE8B438C52869CD4A5DEF48B40E33 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 AB702CDF18EBE8B438C52869CD4A5DEF48B40E33 -s -r CurrentUser AuthRoot
-:: SZCA [yfdyh000]
-::%CertMgr% -del -c -sha1 B0049D436F27237EE59C746A1EF3C96A8E1B54AC -s -r localMachine Root
-::%CertMgr% -del -c -sha1 B0049D436F27237EE59C746A1EF3C96A8E1B54AC -s -r localMachine AuthRoot
-::%CertMgr% -del -c -sha1 B0049D436F27237EE59C746A1EF3C96A8E1B54AC -s -r CurrentUser Root
-::%CertMgr% -del -c -sha1 B0049D436F27237EE59C746A1EF3C96A8E1B54AC -s -r CurrentUser AuthRoot
-:: SZCA(2003-07-22) [yfdyh000]
-::%CertMgr% -del -c -sha1 90D7A97592F0A3E2165DE5DA23B57701D74A298D -s -r localMachine Root
-::%CertMgr% -del -c -sha1 90D7A97592F0A3E2165DE5DA23B57701D74A298D -s -r localMachine AuthRoot
-::%CertMgr% -del -c -sha1 90D7A97592F0A3E2165DE5DA23B57701D74A298D -s -r CurrentUser Root
-::%CertMgr% -del -c -sha1 90D7A97592F0A3E2165DE5DA23B57701D74A298D -s -r CurrentUser AuthRoot
:: Delete certificates(All part)
-:: ROOTCA OSCCA
-::%CertMgr% -del -c -sha1 DBB84423C928ABE889D0E368FC3191D151DDB1AB -s -r localMachine Root
-::%CertMgr% -del -c -sha1 DBB84423C928ABE889D0E368FC3191D151DDB1AB -s -r localMachine AuthRoot
-::%CertMgr% -del -c -sha1 DBB84423C928ABE889D0E368FC3191D151DDB1AB -s -r CurrentUser Root
-::%CertMgr% -del -c -sha1 DBB84423C928ABE889D0E368FC3191D151DDB1AB -s -r CurrentUser AuthRoot
+:CASE_3
:: SRCA
%CertMgr% -del -c -sha1 AE3F2E66D48FC6BD1DF131E89D768D505DF14302 -s -r localMachine Root
%CertMgr% -del -c -sha1 AE3F2E66D48FC6BD1DF131E89D768D505DF14302 -s -r localMachine AuthRoot
@@ -209,21 +92,6 @@ if "%PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432%" == "x86" set CertMgr="%~dp
:: WoTrust Client Authority(USERTrust)
%CertMgr% -del -c -sha1 38CFE78D9F1F0B0637AFCAAA3D5549D87C0AA1D0 -s -r localMachine CA
%CertMgr% -del -c -sha1 38CFE78D9F1F0B0637AFCAAA3D5549D87C0AA1D0 -s -r CurrentUser CA
-:: China Trust Network(1) [QuantumGhost]
-::%CertMgr% -del -c -sha1 C2CAEB0DC296FD50596BCA0F53C5364521167039 -s -r localMachine Root
-::%CertMgr% -del -c -sha1 C2CAEB0DC296FD50596BCA0F53C5364521167039 -s -r localMachine AuthRoot
-::%CertMgr% -del -c -sha1 C2CAEB0DC296FD50596BCA0F53C5364521167039 -s -r CurrentUser Root
-::%CertMgr% -del -c -sha1 C2CAEB0DC296FD50596BCA0F53C5364521167039 -s -r CurrentUser AuthRoot
-:: China Trust Network(2) [QuantumGhost]
-::%CertMgr% -del -c -sha1 B39B0B24B156D8B6123CAF7BA249DC81F27E39FA -s -r localMachine Root
-::%CertMgr% -del -c -sha1 B39B0B24B156D8B6123CAF7BA249DC81F27E39FA -s -r localMachine AuthRoot
-::%CertMgr% -del -c -sha1 B39B0B24B156D8B6123CAF7BA249DC81F27E39FA -s -r CurrentUser Root
-::%CertMgr% -del -c -sha1 B39B0B24B156D8B6123CAF7BA249DC81F27E39FA -s -r CurrentUser AuthRoot
-:: China Trust Network(3) [QuantumGhost]
-::%CertMgr% -del -c -sha1 7C88AE178AE6AB8E69C30AF586D84EF29B6E6AE3 -s -r localMachine Root
-::%CertMgr% -del -c -sha1 7C88AE178AE6AB8E69C30AF586D84EF29B6E6AE3 -s -r localMachine AuthRoot
-::%CertMgr% -del -c -sha1 7C88AE178AE6AB8E69C30AF586D84EF29B6E6AE3 -s -r CurrentUser Root
-::%CertMgr% -del -c -sha1 7C88AE178AE6AB8E69C30AF586D84EF29B6E6AE3 -s -r CurrentUser AuthRoot
:: Hongkong Post Root CA
%CertMgr% -del -c -sha1 E0925E18C7765E22DABD9427529DA6AF4E066428 -s -r localMachine Root
%CertMgr% -del -c -sha1 E0925E18C7765E22DABD9427529DA6AF4E066428 -s -r localMachine AuthRoot
@@ -278,78 +146,303 @@ if "%PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432%" == "x86" set CertMgr="%~dp
:: TWCA Secure Certification Authority
%CertMgr% -del -c -sha1 339D811FEC673E7F731307A34C7C7523ABBE7DFE -s -r localMachine CA
%CertMgr% -del -c -sha1 339D811FEC673E7F731307A34C7C7523ABBE7DFE -s -r CurrentUser CA
+:: Add certificates to CRL(All part)
+%CertMgr% -add -c "%Folder%\SRCA.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\Certification_Authority_Of_WoSign.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\Certification_Authority_Of_WoSign_Chinese.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\Class_1_Primary_CA.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\Certification_Authority_Of_WoSign_200908.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\Certification_Authority_Of_WoSign_StartCom_201103_1.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\Certification_Authority_Of_WoSign_StartCom_201103_2.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\Certification_Authority_Of_WoSign_StartCom_200609.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\Certification_Authority_Of_WoSign_Chinese_StartCom.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\Certification_Authority_Of_WoSign_USERTrust.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\WoSign_Premium_Server_Authority_USERTrust.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\WoSign_Server_Authority_USERTrust.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\WoSign_SGC_Server_Authority_USERTrust.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\WoSign_Client_Authority_USERTrust.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\WoTrust_Premium_Server_Authority_USERTrust.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\WoTrust_Server_Authority_USERTrust.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\WoTrust_SGC_Server_Authority_USERTrust.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\WoTrust_Client_Authority_USERTrust.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\Hongkong_Post_Root_CA.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\Hongkong_Post_Root_CA_1.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\Macao_Post_eSignTrust_Root_Certification_Authority.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\Macao_Post_eSignTrust_Root_Certification_Authority_G02.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\ePKI_Root_Certification_Authority.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\Government_Root_Certification_Authority.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\TWCA_Global_Root_CA.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\TWCA_Root_Certification_Authority_1.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\TWCA_Root_Certification_Authority_2.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\TaiCA_Secure_CA_GTE.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\TWCA_Secure_CA_Baltimore.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\TWCA_Secure_Certification_Authority_USERTrust.crt" -s Disallowed
+
+
+:: Delete certificates(Extended part)
+:CASE_2
+:: CFCA GT CA(2011-06-13)
+%CertMgr% -del -c -sha1 EABDA240440ABBD694930A01D09764C6C2D77966 -s -r localMachine Root
+%CertMgr% -del -c -sha1 EABDA240440ABBD694930A01D09764C6C2D77966 -s -r localMachine AuthRoot
+%CertMgr% -del -c -sha1 EABDA240440ABBD694930A01D09764C6C2D77966 -s -r CurrentUser Root
+%CertMgr% -del -c -sha1 EABDA240440ABBD694930A01D09764C6C2D77966 -s -r CurrentUser AuthRoot
+:: CFCA GT CA(2012-08-21) [YFdyh000]
+%CertMgr% -del -c -sha1 A8F2DFE36AE0CC2DB9DD38347D30AED9551DD25A -s -r localMachine Root
+%CertMgr% -del -c -sha1 A8F2DFE36AE0CC2DB9DD38347D30AED9551DD25A -s -r localMachine AuthRoot
+%CertMgr% -del -c -sha1 A8F2DFE36AE0CC2DB9DD38347D30AED9551DD25A -s -r CurrentUser Root
+%CertMgr% -del -c -sha1 A8F2DFE36AE0CC2DB9DD38347D30AED9551DD25A -s -r CurrentUser AuthRoot
+:: CFCA EV ROOT
+%CertMgr% -del -c -sha1 E2B8294B5584AB6B58C290466CAC3FB8398F8483 -s -r localMachine Root
+%CertMgr% -del -c -sha1 E2B8294B5584AB6B58C290466CAC3FB8398F8483 -s -r localMachine AuthRoot
+%CertMgr% -del -c -sha1 E2B8294B5584AB6B58C290466CAC3FB8398F8483 -s -r CurrentUser Root
+%CertMgr% -del -c -sha1 E2B8294B5584AB6B58C290466CAC3FB8398F8483 -s -r CurrentUser AuthRoot
+:: UCA Global Root
+%CertMgr% -del -c -sha1 0B972C9EA6E7CC58D93B20BF71EC412E7209FABF -s -r localMachine Root
+%CertMgr% -del -c -sha1 0B972C9EA6E7CC58D93B20BF71EC412E7209FABF -s -r localMachine AuthRoot
+%CertMgr% -del -c -sha1 0B972C9EA6E7CC58D93B20BF71EC412E7209FABF -s -r CurrentUser Root
+%CertMgr% -del -c -sha1 0B972C9EA6E7CC58D93B20BF71EC412E7209FABF -s -r CurrentUser AuthRoot
+:: UCA Root(2004-01-01)
+%CertMgr% -del -c -sha1 8250BED5A214433A66377CBC10EF83F669DA3A67 -s -r localMachine Root
+%CertMgr% -del -c -sha1 8250BED5A214433A66377CBC10EF83F669DA3A67 -s -r localMachine AuthRoot
+%CertMgr% -del -c -sha1 8250BED5A214433A66377CBC10EF83F669DA3A67 -s -r CurrentUser Root
+%CertMgr% -del -c -sha1 8250BED5A214433A66377CBC10EF83F669DA3A67 -s -r CurrentUser AuthRoot
+:: UCA Extended Validation Root
+%CertMgr% -del -c -sha1 B9C9F58B3BBEF575E2B58328770E7B0076C40B5E -s -r localMachine Root
+%CertMgr% -del -c -sha1 B9C9F58B3BBEF575E2B58328770E7B0076C40B5E -s -r localMachine AuthRoot
+%CertMgr% -del -c -sha1 B9C9F58B3BBEF575E2B58328770E7B0076C40B5E -s -r CurrentUser Root
+%CertMgr% -del -c -sha1 B9C9F58B3BBEF575E2B58328770E7B0076C40B5E -s -r CurrentUser AuthRoot
+:: UCA ROOT(2001-01-01)
+%CertMgr% -del -c -sha1 3120F295417730075F8CD42D0CAE008EB5726EF8 -s -r localMachine Root
+%CertMgr% -del -c -sha1 3120F295417730075F8CD42D0CAE008EB5726EF8 -s -r localMachine AuthRoot
+%CertMgr% -del -c -sha1 3120F295417730075F8CD42D0CAE008EB5726EF8 -s -r CurrentUser Root
+%CertMgr% -del -c -sha1 3120F295417730075F8CD42D0CAE008EB5726EF8 -s -r CurrentUser AuthRoot
+:: GoAgent CA [lenovo-me]
+%CertMgr% -del -c -sha1 AB702CDF18EBE8B438C52869CD4A5DEF48B40E33 -s -r localMachine Root
+%CertMgr% -del -c -sha1 AB702CDF18EBE8B438C52869CD4A5DEF48B40E33 -s -r localMachine AuthRoot
+%CertMgr% -del -c -sha1 AB702CDF18EBE8B438C52869CD4A5DEF48B40E33 -s -r CurrentUser Root
+%CertMgr% -del -c -sha1 AB702CDF18EBE8B438C52869CD4A5DEF48B40E33 -s -r CurrentUser AuthRoot
+:: Add certificates to CRL(Extended part)
+%CertMgr% -add -c "%Folder%\CFCA_GT_CA_201106.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\CFCA_GT_CA_201208.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\CFCA_EV_ROOT.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\UCA_Global_Root.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\UCA_Root_200401.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\UCA_Extended_Validation_Root.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\UCA_ROOT_200101.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\[Suspicious]GoAgent_CA.crt" -s Disallowed
-@echo.
+:: Delete certificates(Base part)
+:CASE_1
+:: Fake github.com(2013-01-25)
+%CertMgr% -del -c -sha1 27A29C3A8B3261770E8B59448557DC9E9339E68C -s -r localMachine Root
+%CertMgr% -del -c -sha1 27A29C3A8B3261770E8B59448557DC9E9339E68C -s -r localMachine AuthRoot
+%CertMgr% -del -c -sha1 27A29C3A8B3261770E8B59448557DC9E9339E68C -s -r CurrentUser Root
+%CertMgr% -del -c -sha1 27A29C3A8B3261770E8B59448557DC9E9339E68C -s -r CurrentUser AuthRoot
+:: Fake google.com(2014-07-24)
+%CertMgr% -del -c -sha1 F6BEADB9BC02E0A152D71C318739CDECFC1C085D -s -r localMachine Root
+%CertMgr% -del -c -sha1 F6BEADB9BC02E0A152D71C318739CDECFC1C085D -s -r localMachine AuthRoot
+%CertMgr% -del -c -sha1 F6BEADB9BC02E0A152D71C318739CDECFC1C085D -s -r CurrentUser Root
+%CertMgr% -del -c -sha1 F6BEADB9BC02E0A152D71C318739CDECFC1C085D -s -r CurrentUser AuthRoot
+:: Fake google.com(2014-09-18) [YFdyh000]
+%CertMgr% -del -c -sha1 316076F2866588DBB233C7F9EB68B58125150C21 -s -r localMachine Root
+%CertMgr% -del -c -sha1 316076F2866588DBB233C7F9EB68B58125150C21 -s -r localMachine AuthRoot
+%CertMgr% -del -c -sha1 316076F2866588DBB233C7F9EB68B58125150C21 -s -r CurrentUser Root
+%CertMgr% -del -c -sha1 316076F2866588DBB233C7F9EB68B58125150C21 -s -r CurrentUser AuthRoot
+:: Fake yahoo.com(2014-09-30)
+%CertMgr% -del -c -sha1 2290C311EA0F3F57E06DF45B698E18E828E59BC3 -s -r localMachine Root
+%CertMgr% -del -c -sha1 2290C311EA0F3F57E06DF45B698E18E828E59BC3 -s -r localMachine AuthRoot
+%CertMgr% -del -c -sha1 2290C311EA0F3F57E06DF45B698E18E828E59BC3 -s -r CurrentUser Root
+%CertMgr% -del -c -sha1 2290C311EA0F3F57E06DF45B698E18E828E59BC3 -s -r CurrentUser AuthRoot
+:: Fake hotmai.com(2014-10-02)
+%CertMgr% -del -c -sha1 30F3B3ADC6E570BDA606B9F96DE24190CE262C67 -s -r localMachine Root
+%CertMgr% -del -c -sha1 30F3B3ADC6E570BDA606B9F96DE24190CE262C67 -s -r localMachine AuthRoot
+%CertMgr% -del -c -sha1 30F3B3ADC6E570BDA606B9F96DE24190CE262C67 -s -r CurrentUser Root
+%CertMgr% -del -c -sha1 30F3B3ADC6E570BDA606B9F96DE24190CE262C67 -s -r CurrentUser AuthRoot
+:: Fake www.facebook.com(2014-10-08) [Yiwen Zhang]
+%CertMgr% -del -c -sha1 DC6EE6EDC4C078E1B2C12F6D1985000E27CFD318 -s -r localMachine Root
+%CertMgr% -del -c -sha1 DC6EE6EDC4C078E1B2C12F6D1985000E27CFD318 -s -r localMachine AuthRoot
+%CertMgr% -del -c -sha1 DC6EE6EDC4C078E1B2C12F6D1985000E27CFD318 -s -r CurrentUser Root
+%CertMgr% -del -c -sha1 DC6EE6EDC4C078E1B2C12F6D1985000E27CFD318 -s -r CurrentUser AuthRoot
+:: Fake www.icound.com(2014-10-04) [YFdyh000]
+%CertMgr% -del -c -sha1 F468B5F3FED807974476A22B32EA3137D924F7BA -s -r localMachine Root
+%CertMgr% -del -c -sha1 F468B5F3FED807974476A22B32EA3137D924F7BA -s -r localMachine AuthRoot
+%CertMgr% -del -c -sha1 F468B5F3FED807974476A22B32EA3137D924F7BA -s -r CurrentUser Root
+%CertMgr% -del -c -sha1 F468B5F3FED807974476A22B32EA3137D924F7BA -s -r CurrentUser AuthRoot
+:: Fake *.hotmail.com(2015-01-17) [YFdyh000]
+%CertMgr% -del -c -sha1 75F411595FE9A21A17A4967C7B666E5152791A32 -s -r localMachine Root
+%CertMgr% -del -c -sha1 75F411595FE9A21A17A4967C7B666E5152791A32 -s -r localMachine AuthRoot
+%CertMgr% -del -c -sha1 75F411595FE9A21A17A4967C7B666E5152791A32 -s -r CurrentUser Root
+%CertMgr% -del -c -sha1 75F411595FE9A21A17A4967C7B666E5152791A32 -s -r CurrentUser AuthRoot
+:: CNNIC ROOT
+%CertMgr% -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s -r localMachine Root
+%CertMgr% -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s -r localMachine AuthRoot
+%CertMgr% -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s -r CurrentUser Root
+%CertMgr% -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s -r CurrentUser AuthRoot
+:: China Internet Network Information Center EV Certificates Root
+%CertMgr% -del -c -sha1 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E -s -r localMachine Root
+%CertMgr% -del -c -sha1 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E -s -r localMachine AuthRoot
+%CertMgr% -del -c -sha1 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E -s -r CurrentUser Root
+%CertMgr% -del -c -sha1 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E -s -r CurrentUser AuthRoot
+:: CNNIC SSL(Entrust)
+%CertMgr% -del -c -sha1 6856BB1A6C4F76DACA362187CC2CCD484EDDC25D -s -r localMachine CA
+%CertMgr% -del -c -sha1 6856BB1A6C4F76DACA362187CC2CCD484EDDC25D -s -r CurrentUser CA
+:: Baidu WACC service [SCFWSE]
+%CertMgr% -del -c -sha1 561422647B89BE22F203EBCAEF52B5007227510A -s -r localMachine CA
+%CertMgr% -del -c -sha1 561422647B89BE22F203EBCAEF52B5007227510A -s -r CurrentUser CA
+:: GiantRootCA
+%CertMgr% -del -c -sha1 7514436E903C901069980499CA70DE74FC06C83C -s -r localMachine Root
+%CertMgr% -del -c -sha1 7514436E903C901069980499CA70DE74FC06C83C -s -r localMachine AuthRoot
+%CertMgr% -del -c -sha1 7514436E903C901069980499CA70DE74FC06C83C -s -r CurrentUser Root
+%CertMgr% -del -c -sha1 7514436E903C901069980499CA70DE74FC06C83C -s -r CurrentUser AuthRoot
+:: JGZXCA
+%CertMgr% -del -c -sha1 7A4AA61E2A88704115E47748D8647DAEE6837559 -s -r localMachine Root
+%CertMgr% -del -c -sha1 7A4AA61E2A88704115E47748D8647DAEE6837559 -s -r localMachine AuthRoot
+%CertMgr% -del -c -sha1 7A4AA61E2A88704115E47748D8647DAEE6837559 -s -r CurrentUser Root
+%CertMgr% -del -c -sha1 7A4AA61E2A88704115E47748D8647DAEE6837559 -s -r CurrentUser AuthRoot
+:: Superfish, Inc. [Septembers/v998]
+%CertMgr% -del -c -sha1 C864484869D41D2B0D32319C5A62F9315AAF2CBD -s -r localMachine Root
+%CertMgr% -del -c -sha1 C864484869D41D2B0D32319C5A62F9315AAF2CBD -s -r localMachine AuthRoot
+%CertMgr% -del -c -sha1 C864484869D41D2B0D32319C5A62F9315AAF2CBD -s -r CurrentUser Root
+%CertMgr% -del -c -sha1 C864484869D41D2B0D32319C5A62F9315AAF2CBD -s -r CurrentUser AuthRoot
:: Add certificates to CRL(Base part)
-%CertMgr% -add -c "%~dp0\Certs\[Fake]GitHubCom_201301.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Fake]GoogleCom_201407.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Fake]GoogleCom_201409.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Fake]YahooCom_201409.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Fake]HotmaiCom_201410.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Fake]WwwFacebookCom_201410.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Fake]WwwIcloudCom_201410.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Fake]AnyHotmailCom_201501.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\CNNIC_ROOT.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\China_Internet_Network_Information_Center_EV_Certificates_Root.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\CNNIC_SSL_Entrust.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Suspicious]WaccBaiduCom.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\GiantRootCA.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\JGZXCA.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\Superfish_Inc.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\[Fake]GitHubCom_201301.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\[Fake]GoogleCom_201407.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\[Fake]GoogleCom_201409.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\[Fake]YahooCom_201409.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\[Fake]HotmaiCom_201410.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\[Fake]WwwFacebookCom_201410.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\[Fake]WwwIcloudCom_201410.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\[Fake]AnyHotmailCom_201501.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\CNNIC_ROOT.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\China_Internet_Network_Information_Center_EV_Certificates_Root.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\CNNIC_SSL_Entrust.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\[Suspicious]WaccBaiduCom.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\GiantRootCA.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\JGZXCA.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\Superfish_Inc.crt" -s Disallowed
+goto EXIT
-:: Add certificates to CRL(Extended part)
-::%CertMgr% -add -c ROOTCA.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\CFCA_GT_CA_201106.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\CFCA_GT_CA_201208.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\CFCA_EV_ROOT.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\UCA_Global_Root.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\UCA_Root_200401.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\UCA_Extended_Validation_Root.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\UCA_ROOT_200101.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Suspicious]GoAgent_CA.crt" -s Disallowed
-::%CertMgr% -add -c "%~dp0\Certs\SZCA.crt" -s Disallowed
-::%CertMgr% -add -c "%~dp0\Certs\SZCA_200307.crt" -s Disallowed
-:: Add certificates to CRL(All part)
-::%CertMgr% -add -c "%~dp0\Certs\ROOTCA_OSCCA.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\SRCA.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\Certification_Authority_Of_WoSign.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\Certification_Authority_Of_WoSign_Chinese.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\Class_1_Primary_CA.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\Certification_Authority_Of_WoSign_200908.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\Certification_Authority_Of_WoSign_StartCom_201103_1.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\Certification_Authority_Of_WoSign_StartCom_201103_2.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\Certification_Authority_Of_WoSign_StartCom_200609.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\Certification_Authority_Of_WoSign_Chinese_StartCom.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\Certification_Authority_Of_WoSign_USERTrust.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\WoSign_Premium_Server_Authority_USERTrust.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\WoSign_Server_Authority_USERTrust.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\WoSign_SGC_Server_Authority_USERTrust.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\WoSign_Client_Authority_USERTrust.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\WoTrust_Premium_Server_Authority_USERTrust.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\WoTrust_Server_Authority_USERTrust.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\WoTrust_SGC_Server_Authority_USERTrust.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\WoTrust_Client_Authority_USERTrust.crt" -s Disallowed
-::%CertMgr% -add -c "%~dp0\Certs\China_Trust_Network_1.crt" -s Disallowed
-::%CertMgr% -add -c "%~dp0\Certs\China_Trust_Network_2.crt" -s Disallowed
-::%CertMgr% -add -c "%~dp0\Certs\China_Trust_Network_3.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\Hongkong_Post_Root_CA.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\Hongkong_Post_Root_CA_1.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\Macao_Post_eSignTrust_Root_Certification_Authority.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\Macao_Post_eSignTrust_Root_Certification_Authority_G02.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\ePKI_Root_Certification_Authority.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\Government_Root_Certification_Authority.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\TWCA_Global_Root_CA.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\TWCA_Root_Certification_Authority_1.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\TWCA_Root_Certification_Authority_2.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\TaiCA_Secure_CA_GTE.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\TWCA_Secure_CA_Baltimore.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\TWCA_Secure_Certification_Authority_USERTrust.crt" -s Disallowed
+:: Restore certificates
+:CASE_4
+:: Base part
+:: Fake github.com(2013-01-25)
+%CertMgr% -del -c -sha1 27A29C3A8B3261770E8B59448557DC9E9339E68C -s Disallowed
+:: Fake google.com(2014-07-24)
+%CertMgr% -del -c -sha1 F6BEADB9BC02E0A152D71C318739CDECFC1C085D -s Disallowed
+:: Fake google.com(2014-09-18) [YFdyh000]
+%CertMgr% -del -c -sha1 316076F2866588DBB233C7F9EB68B58125150C21 -s Disallowed
+:: Fake yahoo.com(2014-09-30)
+%CertMgr% -del -c -sha1 2290C311EA0F3F57E06DF45B698E18E828E59BC3 -s Disallowed
+:: Fake hotmai.com(2014-10-02)
+%CertMgr% -del -c -sha1 30F3B3ADC6E570BDA606B9F96DE24190CE262C67 -s Disallowed
+:: Fake www.facebook.com(2014-10-08) [Yiwen Zhang]
+%CertMgr% -del -c -sha1 DC6EE6EDC4C078E1B2C12F6D1985000E27CFD318 -s Disallowed
+:: Fake www.icound.com(2014-10-04) [YFdyh000]
+%CertMgr% -del -c -sha1 F468B5F3FED807974476A22B32EA3137D924F7BA -s Disallowed
+:: Fake *.hotmail.com(2015-01-17) [YFdyh000]
+%CertMgr% -del -c -sha1 75F411595FE9A21A17A4967C7B666E5152791A32 -s Disallowed
+:: CNNIC ROOT
+%CertMgr% -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s Disallowed
+:: China Internet Network Information Center EV Certificates Root
+%CertMgr% -del -c -sha1 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E -s Disallowed
+:: CNNIC SSL(Entrust)
+%CertMgr% -del -c -sha1 6856BB1A6C4F76DACA362187CC2CCD484EDDC25D -s Disallowed
+:: Baidu WACC service [SCFWSE]
+%CertMgr% -del -c -sha1 561422647B89BE22F203EBCAEF52B5007227510A -s Disallowed
+:: GiantRootCA
+%CertMgr% -del -c -sha1 7514436E903C901069980499CA70DE74FC06C83C -s Disallowed
+:: JGZXCA
+%CertMgr% -del -c -sha1 7A4AA61E2A88704115E47748D8647DAEE6837559 -s Disallowed
+:: Superfish, Inc. [Septembers/v998]
+%CertMgr% -del -c -sha1 C864484869D41D2B0D32319C5A62F9315AAF2CBD -s Disallowed
+
+:: Extended part
+:: CFCA GT CA(2011-06-13)
+%CertMgr% -del -c -sha1 EABDA240440ABBD694930A01D09764C6C2D77966 -s Disallowed
+:: CFCA GT CA(2012-08-21) [YFdyh000]
+%CertMgr% -del -c -sha1 A8F2DFE36AE0CC2DB9DD38347D30AED9551DD25A -s Disallowed
+:: CFCA EV ROOT
+%CertMgr% -del -c -sha1 E2B8294B5584AB6B58C290466CAC3FB8398F8483 -s Disallowed
+:: UCA Global Root
+%CertMgr% -del -c -sha1 0B972C9EA6E7CC58D93B20BF71EC412E7209FABF -s Disallowed
+:: UCA Root(2004-01-01)
+%CertMgr% -del -c -sha1 8250BED5A214433A66377CBC10EF83F669DA3A67 -s Disallowed
+:: UCA Extended Validation Root
+%CertMgr% -del -c -sha1 B9C9F58B3BBEF575E2B58328770E7B0076C40B5E -s Disallowed
+:: UCA ROOT(2001-01-01)
+%CertMgr% -del -c -sha1 3120F295417730075F8CD42D0CAE008EB5726EF8 -s Disallowed
+:: GoAgent CA [lenovo-me]
+%CertMgr% -del -c -sha1 AB702CDF18EBE8B438C52869CD4A5DEF48B40E33 -s Disallowed
+
+:: All part
+:: SRCA
+%CertMgr% -del -c -sha1 AE3F2E66D48FC6BD1DF131E89D768D505DF14302 -s Disallowed
+:: Certification Authority of WoSign
+%CertMgr% -del -c -sha1 B94294BF91EA8FB64BE61097C7FB001359B676CB -s Disallowed
+:: Certification Authority of WoSign(Chinese)
+%CertMgr% -del -c -sha1 1632478D89F9213A92008563F5A4A7D312408AD6 -s Disallowed
+:: Class 1 Primary CA
+%CertMgr% -del -c -sha1 6A174570A916FBE84453EED3D070A1D8DA442829 -s Disallowed
+:: Certification Authority of WoSign(2009-08-08)
+%CertMgr% -del -c -sha1 33A4D8BC38608EF52EF0E28A35091E9250907FB9 -s Disallowed
+:: Certification Authority of WoSign 1(StartCom/2011-03-01)
+%CertMgr% -del -c -sha1 868241C8B85AF79E2DAC79EDADB723E82A36AFC3 -s Disallowed
+:: Certification Authority of WoSign 2(StartCom/2011-03-01)
+%CertMgr% -del -c -sha1 692790DA5189529CC5CE1E16E984277A03023E99 -s Disallowed
+:: Certification Authority of WoSign(StartCom/2006-09-18)
+%CertMgr% -del -c -sha1 804E5FB7DE84F5F5B28347233EAF07846B6070D3 -s Disallowed
+:: Certification Authority of WoSign(Chinese/StartCom) [v998]
+%CertMgr% -del -c -sha1 D8EFF6C28BB508E4702565F42748454A872BD412 -s Disallowed
+:: Certification Authority of WoSign(USERTrust) [v998]
+%CertMgr% -del -c -sha1 56FAADDC596DCF78D585D83A35BC04B690D12736 -s Disallowed
+:: WoSign Premium Server Authority(USERTrust)
+%CertMgr% -del -c -sha1 E3D569137E603E7BACB6BCC66AE943850C8ADF38 -s Disallowed
+:: WoSign Server Authority(USERTrust)
+%CertMgr% -del -c -sha1 3E14B8BD6C568657D852D95D387249AE857B4A39 -s Disallowed
+:: WoSign SGC Server Authority(USERTrust)
+%CertMgr% -del -c -sha1 6D5A18050D56BFDE525CBE89E8C45DD1B53D12E9 -s Disallowed
+:: WoSign Client Authority(USERTrust)
+%CertMgr% -del -c -sha1 FAD4319D4E173FF3853E51C98D21919BF3DA1A1E -s Disallowed
+:: WoTrust Premium Server Authority(USERTrust)
+%CertMgr% -del -c -sha1 381CBC5048AFD9A02D3E5882D5F22D962B1A5F72 -s Disallowed
+:: WoTrust Server Authority(USERTrust)
+%CertMgr% -del -c -sha1 337DF96418F08A9355870513AFCEBDC68BCED767 -s Disallowed
+:: WoTrust SGC Server Authority(USERTrust)
+%CertMgr% -del -c -sha1 46A762F3C3CF3732DE22A8BA1EBBA3BC048F9B8C -s Disallowed
+:: WoTrust Client Authority(USERTrust)
+%CertMgr% -del -c -sha1 38CFE78D9F1F0B0637AFCAAA3D5549D87C0AA1D0 -s Disallowed
+:: Hongkong Post Root CA
+%CertMgr% -del -c -sha1 E0925E18C7765E22DABD9427529DA6AF4E066428 -s Disallowed
+:: Hongkong Post Root CA 1 [v998]
+%CertMgr% -del -c -sha1 D6DAA8208D09D2154D24B52FCB346EB258B28A58 -s Disallowed
+:: Macao Post eSignTrust Root Certification Authority
+%CertMgr% -del -c -sha1 89C32E6B524E4D65388B9ECEDC637134ED4193A3 -s Disallowed
+:: Macao Post eSignTrust Root Certification Authority(G02)
+%CertMgr% -del -c -sha1 06143151E02B45DDBADD5D8E56530DAAE328CF90 -s Disallowed
+:: ePKI Root Certification Authority
+%CertMgr% -del -c -sha1 67650DF17E8E7E5B8240A4F4564BCFE23D69C6F0 -s Disallowed
+:: Government Root Certification Authority
+%CertMgr% -del -c -sha1 F48B11BFDEABBE94542071E641DE6BBE882B40B9 -s Disallowed
+:: TWCA Global Root CA
+%CertMgr% -del -c -sha1 9CBB4853F6A4F6D352A4E83252556013F5ADAF65 -s Disallowed
+:: TWCA Root Certification Authority(1)
+%CertMgr% -del -c -sha1 CF9E876DD3EBFC422697A3B5A37AA076A9062348 -s Disallowed
+:: TWCA Root Certification Authority(2)
+%CertMgr% -del -c -sha1 DF646DCB7B0FD3A96AEE88C64E2D676711FF9D5F -s Disallowed
+:: TaiCA Secure CA
+%CertMgr% -del -c -sha1 5B404B6DB43E1F71557F75552E7668289B1B6309 -s Disallowed
+:: TWCA Secure CA
+%CertMgr% -del -c -sha1 3F3E6C4B33802A2FEA46C5CACA14770A40018899 -s Disallowed
+:: TWCA Secure Certification Authority
+%CertMgr% -del -c -sha1 339D811FEC673E7F731307A34C7C7523ABBE7DFE -s Disallowed
+
:: Print to screen.
+:EXIT
@echo.
-@echo RevokeChinaCerts All version
-@echo Done. Please confirm the messages on screen.
+@echo RevokeChinaCerts Online batch
+@echo Done, please confirm the messages on screen.
@echo.
@pause
diff --git a/Windows/RevokeChinaCerts_Organization.bat b/Windows/RevokeChinaCerts_Organization.bat
new file mode 100644
index 0000000..82f9959
--- /dev/null
+++ b/Windows/RevokeChinaCerts_Organization.bat
@@ -0,0 +1,298 @@
+:: RevokeChinaCerts Organization batch
+:: Revoke China Certificates.
+::
+:: Author: Chengr28
+::
+
+@echo off
+
+
+:: Locate folder, architecture check and choice
+cd /d %~dp0
+set CertMgr="%cd%\Tools\CertMgr"
+if %PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432% EQU x86 set CertMgr="%cd%\Tools\CertMgr_x86"
+set Folder=%cd%\Certs\Organization
+set /a SetForce = 0
+set SetForceAppender="%cd%\Tools\SoftCertPolicyAppender\SoftCertPolicyAppender"
+@echo RevokeChinaCerts Organization batch
+@echo.
+@echo Do you want to set force cetificates policy? [Y/N]
+@echo Setting force need Administrator permissions and Microsoft .NET Framework 4.0!
+set /p UserChoice="Choose: "
+if /i %UserChoice% EQU Y (set /a SetForce=1)
+@echo.
+@echo 1: Revoke Organization cetificates
+@echo 2: Revoke Organization cetificates(Choice version)
+@echo 3: Restore all Organization revoking
+@echo.
+set /p UserChoice="Choose: "
+set UserChoice=CASE_%UserChoice%
+cls
+goto %UserChoice%
+
+
+:: All version
+:CASE_1
+:: ABC
+%CertMgr% -add -c "%Folder%\ABC.crt" -s Disallowed
+:: ABC TEST CA
+%CertMgr% -add -c "%Folder%\ABC_TEST_CA.crt" -s Disallowed
+:: ABC2048
+%CertMgr% -add -c "%Folder%\ABC2048.crt" -s Disallowed
+:: Alibaba.com Corporation Root CA
+%CertMgr% -add -c "%Folder%\AlibabaCom_Corporation_Root_CA.crt" -s Disallowed
+:: ALIPAY_ROOT
+%CertMgr% -add -c "%Folder%\ALIPAY_ROOT.crt" -s Disallowed
+:: Alipay Trust NetWork
+%CertMgr% -add -c "%Folder%\Alipay_Trust_NetWork.crt" -s Disallowed
+:: BOCOMCA
+%CertMgr% -add -c "%Folder%\BOCOMCA.crt" -s Disallowed
+:: CCB CA ROOT(1999-06-29)
+%CertMgr% -add -c "%Folder%\CCB_CA_ROOT_199906.crt" -s Disallowed
+:: CCB CA ROOT(2009-06-01)
+%CertMgr% -add -c "%Folder%\CCB_CA_ROOT_200906.crt" -s Disallowed
+:: CFCA
+%CertMgr% -add -c "%Folder%\CFCA.crt" -s Disallowed
+:: CFCA CS CA
+%CertMgr% -add -c "%Folder%\CFCA_CS_CA.crt" -s Disallowed
+:: CFCA CS TEST CA
+%CertMgr% -add -c "%Folder%\CFCA_CS_TEST_CA.crt" -s Disallowed
+:: CFCA Operation CA3
+%CertMgr% -add -c "%Folder%\CFCA_Operation_CA3.crt" -s Disallowed
+:: CFCA RCA
+%CertMgr% -add -c "%Folder%\CFCA_RCA.crt" -s Disallowed
+:: CFCA Root CA
+%CertMgr% -add -c "%Folder%\CFCA_Root_CA.crt" -s Disallowed
+:: CFCA RSA RCA
+%CertMgr% -add -c "%Folder%\CFCA_RSA_RCA.crt" -s Disallowed
+:: China Trust Network(1)
+%CertMgr% -add -c "%Folder%\China_Trust_Network_1.crt" -s Disallowed
+:: China Trust Network(2)
+%CertMgr% -add -c "%Folder%\China_Trust_Network_2.crt" -s Disallowed
+:: China Trust Network(3)
+%CertMgr% -add -c "%Folder%\China_Trust_Network_3.crt" -s Disallowed
+:: ICBC
+%CertMgr% -add -c "%Folder%\ICBC.crt" -s Disallowed
+:: ICBC Root CA
+%CertMgr% -add -c "%Folder%\ICBC_Root_CA.crt" -s Disallowed
+:: IcbcCA
+%CertMgr% -add -c "%Folder%\IcbcCA.crt" -s Disallowed
+:: iTruschina CN Root CA(1)
+%CertMgr% -add -c "%Folder%\iTruschina_CN_Root_CA_1.crt" -s Disallowed
+:: iTruschina CN Root CA(2)
+%CertMgr% -add -c "%Folder%\iTruschina_CN_Root_CA_2.crt" -s Disallowed
+:: iTruschina CN Root CA(3)
+%CertMgr% -add -c "%Folder%\iTruschina_CN_Root_CA_3.crt" -s Disallowed
+:: Personal ICBC CA
+%CertMgr% -add -c "%Folder%\Personal_ICBC_CA.crt" -s Disallowed
+:: ROOTCA OSCCA
+%CertMgr% -add -c "%Folder%\ROOTCA_OSCCA.crt" -s Disallowed
+:: SZCA
+%CertMgr% -add -c "%Folder%\SZCA.crt" -s Disallowed
+:: SZCA(20030722)
+%CertMgr% -add -c "%Folder%\SZCA_200307.crt" -s Disallowed
+:: TenpayCom Root CA
+%CertMgr% -add -c "%Folder%\TenpayCom_Root_CA.crt" -s Disallowed
+:: Set force
+@echo.
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\ABC.crt" "%Folder%\ABC_TEST_CA.crt" "%Folder%\ABC2048.crt" "%Folder%\AlibabaCom_Corporation_Root_CA.crt" "%Folder%\ALIPAY_ROOT.crt" "%Folder%\Alipay_Trust_NetWork.crt" "%Folder%\BOCOMCA.crt" "%Folder%\CCB_CA_ROOT_199906.crt" "%Folder%\CCB_CA_ROOT_200906.crt" "%Folder%\CFCA.crt" "%Folder%\CFCA_CS_CA.crt" "%Folder%\CFCA_CS_TEST_CA.crt" "%Folder%\CFCA_Operation_CA3.crt" "%Folder%\CFCA_RCA.crt" "%Folder%\CFCA_Root_CA.crt" "%Folder%\CFCA_RSA_RCA.crt" "%Folder%\China_Trust_Network_1.crt" "%Folder%\China_Trust_Network_2.crt" "%Folder%\China_Trust_Network_3.crt" "%Folder%\ICBC.crt" "%Folder%\ICBC_Root_CA.crt" "%Folder%\IcbcCA.crt" "%Folder%\iTruschina_CN_Root_CA_1.crt" "%Folder%\iTruschina_CN_Root_CA_2.crt" "%Folder%\iTruschina_CN_Root_CA_3.crt" "%Folder%\Personal_ICBC_CA.crt" "%Folder%\ROOTCA_OSCCA.crt" "%Folder%\SZCA.crt" "%Folder%\SZCA_200307.crt" "%Folder%\TenpayCom_Root_CA.crt")
+goto EXIT
+
+
+:: Choice version
+:CASE_2
+set /p UserChoice="Revoke ABC? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\ABC.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\ABC.crt"))
+@echo.
+set /p UserChoice="Revoke ABC TEST CA? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\ABC_TEST_CA.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force %Folder%\ABC_TEST_CA.crt""))
+@echo.
+set /p UserChoice="Revoke ABC2048? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\ABC2048.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force %Folder%\ABC2048.crt""))
+@echo.
+set /p UserChoice="Revoke Alibaba.com Corporation Root CA? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\AlibabaCom_Corporation_Root_CA.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\AlibabaCom_Corporation_Root_CA.crt"))
+@echo.
+set /p UserChoice="Revoke ALIPAY_ROOT? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\ALIPAY_ROOT.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\ALIPAY_ROOT.crt"))
+@echo.
+set /p UserChoice="Revoke Alipay Trust NetWork? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\Alipay_Trust_NetWork.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\Alipay_Trust_NetWork.crt"))
+@echo.
+set /p UserChoice="Revoke BOCOMCA? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\BOCOMCA.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\BOCOMCA.crt"))
+@echo.
+set /p UserChoice="Revoke CCB CA ROOT(1999-06-29)? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\CCB_CA_ROOT_199906.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\CCB_CA_ROOT_199906.crt"))
+@echo.
+set /p UserChoice="Revoke CCB CA ROOT(2009-06-01)? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\CCB_CA_ROOT_200906.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\CCB_CA_ROOT_200906.crt"))
+@echo.
+set /p UserChoice="Revoke CFCA? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\CFCA.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\CFCA.crt"))
+@echo.
+set /p UserChoice="Revoke CFCA CS CA? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\CFCA_CS_CA.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\CFCA_CS_CA.crt"))
+@echo.
+set /p UserChoice="Revoke CFCA CS TEST CA? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\CFCA_CS_TEST_CA.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\CFCA_CS_TEST_CA.crt"))
+@echo.
+set /p UserChoice="Revoke CFCA Operation CA3? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\CFCA_Operation_CA3.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\CFCA_Operation_CA3.crt"))
+@echo.
+set /p UserChoice="Revoke CFCA RCA? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\CFCA_RCA.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\CFCA_RCA.crt"))
+@echo.
+set /p UserChoice="Revoke CFCA Root CA? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\CFCA_Root_CA.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\CFCA_Root_CA.crt"))
+@echo.
+set /p UserChoice="Revoke CFCA RSA RCA? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\CFCA_RSA_RCA.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\CFCA_RSA_RCA.crt"))
+@echo.
+set /p UserChoice="Revoke China Trust Network(1)? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\China_Trust_Network_1.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\China_Trust_Network_1.crt"))
+@echo.
+set /p UserChoice="Revoke China Trust Network(2)? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\China_Trust_Network_2.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\China_Trust_Network_2.crt"))
+@echo.
+set /p UserChoice="Revoke China Trust Network(3)? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\China_Trust_Network_3.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\China_Trust_Network_3.crt"))
+@echo.
+set /p UserChoice="Revoke ICBC? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\ICBC.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\ICBC.crt"))
+@echo.
+set /p UserChoice="Revoke ICBC Root CA? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\ICBC_Root_CA.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\ICBC_Root_CA.crt"))
+@echo.
+set /p UserChoice="Revoke IcbcCA? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\IcbcCA.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\IcbcCA.crt"))
+@echo.
+set /p UserChoice="Revoke iTruschina CN Root CA(1)? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\iTruschina_CN_Root_CA_1.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\iTruschina_CN_Root_CA_1.crt"))
+@echo.
+set /p UserChoice="Revoke iTruschina CN Root CA(2)? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\iTruschina_CN_Root_CA_2.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\iTruschina_CN_Root_CA_2.crt"))
+@echo.
+set /p UserChoice="Revoke iTruschina CN Root CA(3)? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\iTruschina_CN_Root_CA_3.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\iTruschina_CN_Root_CA_3.crt"))
+@echo.
+set /p UserChoice="Revoke Personal ICBC CA? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\Personal_ICBC_CA.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\Personal_ICBC_CA.crt"))
+@echo.
+set /p UserChoice="Revoke ROOTCA OSCCA? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\ROOTCA_OSCCA.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\ROOTCA_OSCCA.crt"))
+@echo.
+set /p UserChoice="Revoke SZCA? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\SZCA.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\SZCA.crt"))
+@echo.
+set /p UserChoice="Revoke SZCA(20030722)? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\SZCA_200307.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\SZCA_200307.crt"))
+@echo.
+set /p UserChoice="Revoke TenpayCom Root CA? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\TenpayCom_Root_CA.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\TenpayCom_Root_CA.crt"))
+goto EXIT
+
+
+:: Restore certificates
+:: ABC
+%CertMgr% -del -c -sha1 78D0CDF5752D1E5B58A674644CFE3499BF02F9EF -s Disallowed
+:: ABC TEST CA
+%CertMgr% -del -c -sha1 F18C39F8B5A3E9BADC811BBA7690E8D0143BD851 -s Disallowed
+:: ABC2048
+%CertMgr% -del -c -sha1 6FAE9AD81467C5FCB93574670F52C8EF538F8B6D -s Disallowed
+:: Alibaba.com Corporation Root CA
+%CertMgr% -del -c -sha1 A7217F919843199C958C128449DD52D2723B0A8A -s Disallowed
+:: ALIPAY_ROOT
+%CertMgr% -del -c -sha1 59864294A96B3E5C37C058E9D1FBDE5FF0C2E4EE -s Disallowed
+:: Alipay Trust NetWork
+%CertMgr% -del -c -sha1 89A2FB0E332BA7275FE712FEC669D746125B1F32 -s Disallowed
+:: BOCOMCA
+%CertMgr% -del -c -sha1 4571466B830EAC5FCDC22103B9733C1A15CE78AC -s Disallowed
+:: CCB CA ROOT(1999-06-29)
+%CertMgr% -del -c -sha1 3018E5D74DF29E3590F5BB8DF01AA7FC116BB4DE -s Disallowed
+:: CCB CA ROOT(2009-06-01)
+%CertMgr% -del -c -sha1 8582B4AF7491B3D16636EEB32D44993D7DEE6C40 -s Disallowed
+:: CFCA
+%CertMgr% -del -c -sha1 A9743B713E4109381622D3689AB5D9E1DC51B164 -s Disallowed
+:: CFCA CS CA
+%CertMgr% -del -c -sha1 D3FBFAA8A67FC9A2EADBF86AEB5D07A9D6AF322E -s Disallowed
+:: CFCA CS TEST CA
+%CertMgr% -del -c -sha1 B5DCF1C58E86DBED2EA2D217A5C28D11FD9254F0 -s Disallowed
+:: CFCA Operation CA3
+%CertMgr% -del -c -sha1 5A3A3EA74AE5D29F25A670024949869D1222E42A -s Disallowed
+:: CFCA RCA
+%CertMgr% -del -c -sha1 AE73DFF81CF24E50DD52CA1496E7EF94876061CB -s Disallowed
+:: CFCA Root CA
+%CertMgr% -del -c -sha1 31BD6AEF73031C5A49338E7A06040DD815EF7512 -s Disallowed
+:: CFCA RSA RCA
+%CertMgr% -del -c -sha1 57C5CEBB53FBF181E0B13977AF864F1C13F11AA9 -s Disallowed
+:: China Trust Network(1)
+%CertMgr% -del -c -sha1 C2CAEB0DC296FD50596BCA0F53C5364521167039 -s Disallowed
+:: China Trust Network(2)
+%CertMgr% -del -c -sha1 B39B0B24B156D8B6123CAF7BA249DC81F27E39FA -s Disallowed
+:: China Trust Network(3)
+%CertMgr% -del -c -sha1 7C88AE178AE6AB8E69C30AF586D84EF29B6E6AE3 -s Disallowed
+:: ICBC
+%CertMgr% -del -c -sha1 E3F9043072BABF5E9C631960B34CCCF9FFC8BA41 -s Disallowed
+:: ICBC Root CA
+%CertMgr% -del -c -sha1 5A960203C10CFA8D42DD115B61154F98E2F617F7 -s Disallowed
+:: IcbcCA
+%CertMgr% -del -c -sha1 A02A23D13576ECA35498DC69166A20651E203E31 -s Disallowed
+:: iTruschina CN Root CA(1)
+%CertMgr% -del -c -sha1 240A61A2577970625B9F0B81283C4AA4037217B1 -s Disallowed
+:: iTruschina CN Root CA(2)
+%CertMgr% -del -c -sha1 46F168AF009C28C18F452EB85F5E8747892B3C8B -s Disallowed
+:: iTruschina CN Root CA(3)
+%CertMgr% -del -c -sha1 654E9FADD2032AE1B87D6263AF04FD7FEE38D57C -s Disallowed
+:: Personal ICBC CA
+%CertMgr% -del -c -sha1 2ABC81B0D7D052F887965562BB10AA66A80F7674 -s Disallowed
+:: ROOTCA OSCCA
+%CertMgr% -del -c -sha1 DBB84423C928ABE889D0E368FC3191D151DDB1AB -s Disallowed
+:: SZCA
+%CertMgr% -del -c -sha1 B0049D436F27237EE59C746A1EF3C96A8E1B54AC -s Disallowed
+:: SZCA(20030722)
+%CertMgr% -del -c -sha1 90D7A97592F0A3E2165DE5DA23B57701D74A298D -s Disallowed
+:: TenpayCom Root CA
+%CertMgr% -del -c -sha1 56502166C0DE2488950491C90C7560E0E7AA7378 -s Disallowed
+:: Unset force
+@echo.
+if %SetForce% EQU 1 (%SetForceAppender% -r --unset-force "%Folder%\ABC.crt" "%Folder%\ABC_TEST_CA.crt" "%Folder%\ABC2048.crt" "%Folder%\AlibabaCom_Corporation_Root_CA.crt" "%Folder%\ALIPAY_ROOT.crt" "%Folder%\Alipay_Trust_NetWork.crt" "%Folder%\BOCOMCA.crt" "%Folder%\CCB_CA_ROOT_199906.crt" "%Folder%\CCB_CA_ROOT_200906.crt" "%Folder%\CFCA.crt" "%Folder%\CFCA_CS_CA.crt" "%Folder%\CFCA_CS_TEST_CA.crt" "%Folder%\CFCA_Operation_CA3.crt" "%Folder%\CFCA_RCA.crt" "%Folder%\CFCA_Root_CA.crt" "%Folder%\CFCA_RSA_RCA.crt" "%Folder%\China_Trust_Network_1.crt" "%Folder%\China_Trust_Network_2.crt" "%Folder%\China_Trust_Network_3.crt" "%Folder%\ICBC.crt" "%Folder%\ICBC_Root_CA.crt" "%Folder%\IcbcCA.crt" "%Folder%\iTruschina_CN_Root_CA_1.crt" "%Folder%\iTruschina_CN_Root_CA_2.crt" "%Folder%\iTruschina_CN_Root_CA_3.crt" "%Folder%\Personal_ICBC_CA.crt" "%Folder%\ROOTCA_OSCCA.crt" "%Folder%\SZCA.crt" "%Folder%\SZCA_200307.crt" "%Folder%\TenpayCom_Root_CA.crt")
+
+
+:: Print to screen.
+:EXIT
+@echo.
+@echo RevokeChinaCerts Organization batch
+@echo Done, please confirm the messages on screen.
+@echo.
+@pause
diff --git a/Windows/RevokeChinaCerts_Restore.bat b/Windows/RevokeChinaCerts_Restore.bat
deleted file mode 100644
index b7a184f..0000000
--- a/Windows/RevokeChinaCerts_Restore.bat
+++ /dev/null
@@ -1,147 +0,0 @@
-:: RevokeChinaCerts Restore batch
-:: Revoke China Certificates.
-::
-:: Author: JayXon, Chengr28
-::
-
-@echo off
-
-:: Update certificates list of system.
-cd /d %~dp0
-"%~dp0\Tools\RootSUPD_201403_x86"
-
-:: Architecture check
-set CertMgr="%~dp0\Tools\CertMgr"
-if "%PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432%" == "x86" set CertMgr="%~dp0\Tools\CertMgr_x86"
-
-:: Restore certificates(Base part)
-:: Fake github.com(2013-01-25)
-%CertMgr% -del -c -sha1 27A29C3A8B3261770E8B59448557DC9E9339E68C -s Disallowed
-:: Fake google.com(2014-07-24)
-%CertMgr% -del -c -sha1 F6BEADB9BC02E0A152D71C318739CDECFC1C085D -s Disallowed
-:: Fake google.com(2014-09-18) [YFdyh000]
-%CertMgr% -del -c -sha1 316076F2866588DBB233C7F9EB68B58125150C21 -s Disallowed
-:: Fake yahoo.com(2014-09-30)
-%CertMgr% -del -c -sha1 2290C311EA0F3F57E06DF45B698E18E828E59BC3 -s Disallowed
-:: Fake hotmai.com(2014-10-02)
-%CertMgr% -del -c -sha1 30F3B3ADC6E570BDA606B9F96DE24190CE262C67 -s Disallowed
-:: Fake www.facebook.com(2014-10-08) [Yiwen Zhang]
-%CertMgr% -del -c -sha1 DC6EE6EDC4C078E1B2C12F6D1985000E27CFD318 -s Disallowed
-:: Fake www.icound.com(2014-10-04) [YFdyh000]
-%CertMgr% -del -c -sha1 F468B5F3FED807974476A22B32EA3137D924F7BA -s Disallowed
-:: Fake *.hotmail.com(2015-01-17) [YFdyh000]
-%CertMgr% -del -c -sha1 75F411595FE9A21A17A4967C7B666E5152791A32 -s Disallowed
-:: CNNIC ROOT
-%CertMgr% -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s Disallowed
-:: China Internet Network Information Center EV Certificates Root
-%CertMgr% -del -c -sha1 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E -s Disallowed
-:: CNNIC SSL(Entrust)
-%CertMgr% -del -c -sha1 6856BB1A6C4F76DACA362187CC2CCD484EDDC25D -s Disallowed
-:: Baidu WACC service [SCFWSE]
-%CertMgr% -del -c -sha1 561422647B89BE22F203EBCAEF52B5007227510A -s Disallowed
-:: GiantRootCA
-%CertMgr% -del -c -sha1 7514436E903C901069980499CA70DE74FC06C83C -s Disallowed
-:: JGZXCA
-%CertMgr% -del -c -sha1 7A4AA61E2A88704115E47748D8647DAEE6837559 -s Disallowed
-:: Superfish, Inc. [Septembers/v998]
-%CertMgr% -del -c -sha1 C864484869D41D2B0D32319C5A62F9315AAF2CBD -s Disallowed
-
-:: Restore certificates(Extended part)
-:: CFCA GT CA(2011-06-13)
-%CertMgr% -del -c -sha1 EABDA240440ABBD694930A01D09764C6C2D77966 -s Disallowed
-:: CFCA GT CA(2012-08-21) [YFdyh000]
-%CertMgr% -del -c -sha1 A8F2DFE36AE0CC2DB9DD38347D30AED9551DD25A -s Disallowed
-:: CFCA EV ROOT
-%CertMgr% -del -c -sha1 E2B8294B5584AB6B58C290466CAC3FB8398F8483 -s Disallowed
-:: UCA Global Root
-%CertMgr% -del -c -sha1 0B972C9EA6E7CC58D93B20BF71EC412E7209FABF -s Disallowed
-:: UCA Root(2004-01-01)
-%CertMgr% -del -c -sha1 8250BED5A214433A66377CBC10EF83F669DA3A67 -s Disallowed
-:: UCA Extended Validation Root
-%CertMgr% -del -c -sha1 B9C9F58B3BBEF575E2B58328770E7B0076C40B5E -s Disallowed
-:: UCA ROOT(2001-01-01)
-%CertMgr% -del -c -sha1 3120F295417730075F8CD42D0CAE008EB5726EF8 -s Disallowed
-:: GoAgent CA [lenovo-me]
-%CertMgr% -del -c -sha1 AB702CDF18EBE8B438C52869CD4A5DEF48B40E33 -s Disallowed
-:: SZCA [yfdyh000]
-::%CertMgr% -del -c -sha1 B0049D436F27237EE59C746A1EF3C96A8E1B54AC -s Disallowed
-:: SZCA(2003-07-22) [yfdyh000]
-::%CertMgr% -del -c -sha1 90D7A97592F0A3E2165DE5DA23B57701D74A298D -s Disallowed
-
-:: Restore certificates(All part)
-:: ROOTCA OSCCA
-::%CertMgr% -del -c -sha1 DBB84423C928ABE889D0E368FC3191D151DDB1AB -s Disallowed
-:: SRCA
-%CertMgr% -del -c -sha1 AE3F2E66D48FC6BD1DF131E89D768D505DF14302 -s Disallowed
-:: Certification Authority of WoSign
-%CertMgr% -del -c -sha1 B94294BF91EA8FB64BE61097C7FB001359B676CB -s Disallowed
-:: Certification Authority of WoSign(Chinese)
-%CertMgr% -del -c -sha1 1632478D89F9213A92008563F5A4A7D312408AD6 -s Disallowed
-:: Class 1 Primary CA
-%CertMgr% -del -c -sha1 6A174570A916FBE84453EED3D070A1D8DA442829 -s Disallowed
-:: Certification Authority of WoSign(2009-08-08)
-%CertMgr% -del -c -sha1 33A4D8BC38608EF52EF0E28A35091E9250907FB9 -s Disallowed
-:: Certification Authority of WoSign 1(StartCom/2011-03-01)
-%CertMgr% -del -c -sha1 868241C8B85AF79E2DAC79EDADB723E82A36AFC3 -s Disallowed
-:: Certification Authority of WoSign 2(StartCom/2011-03-01)
-%CertMgr% -del -c -sha1 692790DA5189529CC5CE1E16E984277A03023E99 -s Disallowed
-:: Certification Authority of WoSign(StartCom/2006-09-18)
-%CertMgr% -del -c -sha1 804E5FB7DE84F5F5B28347233EAF07846B6070D3 -s Disallowed
-:: Certification Authority of WoSign(Chinese/StartCom) [v998]
-%CertMgr% -del -c -sha1 D8EFF6C28BB508E4702565F42748454A872BD412 -s Disallowed
-:: Certification Authority of WoSign(USERTrust) [v998]
-%CertMgr% -del -c -sha1 56FAADDC596DCF78D585D83A35BC04B690D12736 -s Disallowed
-:: WoSign Premium Server Authority(USERTrust)
-%CertMgr% -del -c -sha1 E3D569137E603E7BACB6BCC66AE943850C8ADF38 -s Disallowed
-:: WoSign Server Authority(USERTrust)
-%CertMgr% -del -c -sha1 3E14B8BD6C568657D852D95D387249AE857B4A39 -s Disallowed
-:: WoSign SGC Server Authority(USERTrust)
-%CertMgr% -del -c -sha1 6D5A18050D56BFDE525CBE89E8C45DD1B53D12E9 -s Disallowed
-:: WoSign Client Authority(USERTrust)
-%CertMgr% -del -c -sha1 FAD4319D4E173FF3853E51C98D21919BF3DA1A1E -s Disallowed
-:: WoTrust Premium Server Authority(USERTrust)
-%CertMgr% -del -c -sha1 381CBC5048AFD9A02D3E5882D5F22D962B1A5F72 -s Disallowed
-:: WoTrust Server Authority(USERTrust)
-%CertMgr% -del -c -sha1 337DF96418F08A9355870513AFCEBDC68BCED767 -s Disallowed
-:: WoTrust SGC Server Authority(USERTrust)
-%CertMgr% -del -c -sha1 46A762F3C3CF3732DE22A8BA1EBBA3BC048F9B8C -s Disallowed
-:: WoTrust Client Authority(USERTrust)
-%CertMgr% -del -c -sha1 38CFE78D9F1F0B0637AFCAAA3D5549D87C0AA1D0 -s Disallowed
-:: China Trust Network(1) [QuantumGhost]
-::%CertMgr% -del -c -sha1 C2CAEB0DC296FD50596BCA0F53C5364521167039 -s Disallowed
-:: China Trust Network(2) [QuantumGhost]
-::%CertMgr% -del -c -sha1 B39B0B24B156D8B6123CAF7BA249DC81F27E39FA -s Disallowed
-:: China Trust Network(3) [QuantumGhost]
-::%CertMgr% -del -c -sha1 7C88AE178AE6AB8E69C30AF586D84EF29B6E6AE3 -s Disallowed
-:: Hongkong Post Root CA
-%CertMgr% -del -c -sha1 E0925E18C7765E22DABD9427529DA6AF4E066428 -s Disallowed
-:: Hongkong Post Root CA 1 [v998]
-%CertMgr% -del -c -sha1 D6DAA8208D09D2154D24B52FCB346EB258B28A58 -s Disallowed
-:: Macao Post eSignTrust Root Certification Authority
-%CertMgr% -del -c -sha1 89C32E6B524E4D65388B9ECEDC637134ED4193A3 -s Disallowed
-:: Macao Post eSignTrust Root Certification Authority(G02)
-%CertMgr% -del -c -sha1 06143151E02B45DDBADD5D8E56530DAAE328CF90 -s Disallowed
-:: ePKI Root Certification Authority
-%CertMgr% -del -c -sha1 67650DF17E8E7E5B8240A4F4564BCFE23D69C6F0 -s Disallowed
-:: Government Root Certification Authority
-%CertMgr% -del -c -sha1 F48B11BFDEABBE94542071E641DE6BBE882B40B9 -s Disallowed
-:: TWCA Global Root CA
-%CertMgr% -del -c -sha1 9CBB4853F6A4F6D352A4E83252556013F5ADAF65 -s Disallowed
-:: TWCA Root Certification Authority(1)
-%CertMgr% -del -c -sha1 CF9E876DD3EBFC422697A3B5A37AA076A9062348 -s Disallowed
-:: TWCA Root Certification Authority(2)
-%CertMgr% -del -c -sha1 DF646DCB7B0FD3A96AEE88C64E2D676711FF9D5F -s Disallowed
-:: TaiCA Secure CA
-%CertMgr% -del -c -sha1 5B404B6DB43E1F71557F75552E7668289B1B6309 -s Disallowed
-:: TWCA Secure CA
-%CertMgr% -del -c -sha1 3F3E6C4B33802A2FEA46C5CACA14770A40018899 -s Disallowed
-:: TWCA Secure Certification Authority
-%CertMgr% -del -c -sha1 339D811FEC673E7F731307A34C7C7523ABBE7DFE -s Disallowed
-
-:: Print to screen.
-::Exit
-@echo.
-@echo RevokeChinaCerts Restore version
-@echo Done. Please confirm the messages on screen.
-@echo.
-@pause
diff --git a/Windows/ArchiveCerts/SoftCertPolicyAppender/LocalPolicy.dll b/Windows/Tools/SoftCertPolicyAppender/LocalPolicy.dll
similarity index 100%
rename from Windows/ArchiveCerts/SoftCertPolicyAppender/LocalPolicy.dll
rename to Windows/Tools/SoftCertPolicyAppender/LocalPolicy.dll
diff --git a/Windows/Tools/SoftCertPolicyAppender/SoftCertPolicyAppender.exe b/Windows/Tools/SoftCertPolicyAppender/SoftCertPolicyAppender.exe
new file mode 100644
index 0000000000000000000000000000000000000000..6d128dbaf42b7c6ea109687874feefe4cabe8ff6
GIT binary patch
literal 15872
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
pB9Df`#K3_KN30@S3bt	R2I_m!g3c_Wx<vjLrUEpZ|Xv_&;a<S6To7
literal 0
HcmV?d00001
diff --git a/Windows/Tools/SoftCertPolicyAppender/Source/.gitignore b/Windows/Tools/SoftCertPolicyAppender/Source/.gitignore
new file mode 100644
index 0000000..60b0755
--- /dev/null
+++ b/Windows/Tools/SoftCertPolicyAppender/Source/.gitignore
@@ -0,0 +1,182 @@
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.sln.docstates
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+x64/
+build/
+bld/
+[Bb]in/
+[Oo]bj/
+
+# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
+!packages/*/build/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+#NUNIT
+*.VisualState.xml
+TestResult.xml
+
+*_i.c
+*_p.c
+*_i.h
+*.ilk
+*.meta
+*.obj
+*.pch
+#*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+*.cachefile
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding addin-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+*.ncrunch*
+_NCrunch_*
+.*crunch*.local.xml
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+
+# NuGet Packages Directory
+## TODO: If you have NuGet Package Restore enabled, uncomment the next line
+#packages/
+## TODO: If the tool you use requires repositories.config, also uncomment the next line
+#!packages/repositories.config
+
+# Windows Azure Build Output
+csx/
+*.build.csdef
+
+# Windows Store app package directory
+AppPackages/
+
+# Others
+sql/
+*.Cache
+ClientBin/
+[Ss]tyle[Cc]op.*
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.pfx
+*.publishsettings
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+App_Data/*.mdf
+App_Data/*.ldf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# =========================
+# Windows detritus
+# =========================
+
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+#diff backup
+*.orig
diff --git a/Windows/Tools/SoftCertPolicyAppender/Source/README.md b/Windows/Tools/SoftCertPolicyAppender/Source/README.md
new file mode 100644
index 0000000..963b928
--- /dev/null
+++ b/Windows/Tools/SoftCertPolicyAppender/Source/README.md
@@ -0,0 +1,20 @@
+## 使用方法 ##
+SoftCertPolicyAppender.exe <å‚æ•°> <è¯ä¹¦è·¯å¾„>
+
+SoftCertPolicyAppender.exe <å‚æ•°> <è¯ä¹¦è·¯å¾„> <è¯ä¹¦è·¯å¾„2> ...
+
+**å‚数说明**
+
+- --set-force å¯ç”¨å¼ºåˆ¶ç–ç•¥
+- --unset-force å–消强制ç–ç•¥
+- -r 移除è¯ä¹¦è§„则
+- -h 显示帮助信æ¯
+
+
+## 备注 ##
+- 需è¦ç®¡ç†å‘˜æƒé™
+- 需è¦[.net framework 4.0](http://www.microsoft.com/en-us/download/details.aspx?id=17718)
+
+
+## 引用组件 ##
+[local-policy](https://bitbucket.org/MartinEden/local-policy/overview)
diff --git a/Windows/ArchiveCerts/SoftCertPolicyAppender/Source/SoftCertPolicyAppender.sln b/Windows/Tools/SoftCertPolicyAppender/Source/SoftCertPolicyAppender.sln
similarity index 100%
rename from Windows/ArchiveCerts/SoftCertPolicyAppender/Source/SoftCertPolicyAppender.sln
rename to Windows/Tools/SoftCertPolicyAppender/Source/SoftCertPolicyAppender.sln
diff --git a/Windows/ArchiveCerts/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/CertPolicyAppender.cs b/Windows/Tools/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/CertPolicyAppender.cs
similarity index 100%
rename from Windows/ArchiveCerts/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/CertPolicyAppender.cs
rename to Windows/Tools/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/CertPolicyAppender.cs
diff --git a/Windows/ArchiveCerts/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/Program.cs b/Windows/Tools/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/Program.cs
similarity index 85%
rename from Windows/ArchiveCerts/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/Program.cs
rename to Windows/Tools/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/Program.cs
index ab16c2b..436a764 100644
--- a/Windows/ArchiveCerts/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/Program.cs
+++ b/Windows/Tools/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/Program.cs
@@ -14,15 +14,16 @@ namespace SoftCertPolicyAppender
if (args.Contains("-h") || args.Contains("--help")||args.Length==0)
{
- const string usage = @"Usage:SoftwareRestrictionPolicyController.exe [OPTOION]... [CERTFILE]...
-config software restriction policy by cli
+ const string usage = @"Usage: SoftwareRestrictionPolicyController.exe [Option]... [CertFile]...
+Config software restriction policy by cli.
-OPTIONs
- --set-force set force certificate policy
- --unset-force unset force certificate policy
- -r remove certificate rule by CERTFILEs not add
-CERTFILEs
- certificate file path that will add certificate rule
+Options:
+ --set-force set force certificate policy.
+ --unset-force unset force certificate policy.
+ -r remove certificate rule by CERTFILEs not add.
+
+CertFiles:
+ Certificate file path that will add certificate rule.
";
Console.Write(usage);
return;
diff --git a/Windows/ArchiveCerts/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/Properties/AssemblyInfo.cs b/Windows/Tools/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/Properties/AssemblyInfo.cs
similarity index 95%
rename from Windows/ArchiveCerts/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/Properties/AssemblyInfo.cs
rename to Windows/Tools/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/Properties/AssemblyInfo.cs
index f0b9516..0da5aa0 100644
--- a/Windows/ArchiveCerts/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/Properties/AssemblyInfo.cs
+++ b/Windows/Tools/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("AutoAddSoftCertPolicy")]
-[assembly: AssemblyCopyright("Copyright © 2014")]
+[assembly: AssemblyCopyright("Copyright © 2014 lhyqy5")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
diff --git a/Windows/ArchiveCerts/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/SoftCertPolicyAppender.csproj b/Windows/Tools/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/SoftCertPolicyAppender.csproj
similarity index 96%
rename from Windows/ArchiveCerts/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/SoftCertPolicyAppender.csproj
rename to Windows/Tools/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/SoftCertPolicyAppender.csproj
index 3f475b3..bbfbeea 100644
--- a/Windows/ArchiveCerts/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/SoftCertPolicyAppender.csproj
+++ b/Windows/Tools/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/SoftCertPolicyAppender.csproj
@@ -11,6 +11,7 @@
<AssemblyName>SoftCertPolicyAppender</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
+ <TargetFrameworkProfile>Client</TargetFrameworkProfile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -52,6 +53,7 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
+ <None Include="app.config" />
<None Include="app.manifest" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/Windows/Tools/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/app.config b/Windows/Tools/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/app.config
new file mode 100644
index 0000000..e2a5a18
--- /dev/null
+++ b/Windows/Tools/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/></startup></configuration>
diff --git a/Windows/ArchiveCerts/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/app.manifest b/Windows/Tools/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/app.manifest
similarity index 100%
rename from Windows/ArchiveCerts/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/app.manifest
rename to Windows/Tools/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/app.manifest
diff --git a/Windows/Tools/SoftCertPolicyAppender/Source/_libs/LocalPolicy.dll b/Windows/Tools/SoftCertPolicyAppender/Source/_libs/LocalPolicy.dll
new file mode 100644
index 0000000000000000000000000000000000000000..ce6182b9df0b1bd80182a285ce8e346af164932f
GIT binary patch
literal 15360
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
literal 0
HcmV?d00001
diff --git a/Windows/ArchiveCerts/SoftCertPolicyAppender/Source/_libs/LocalPolicy.pdb b/Windows/Tools/SoftCertPolicyAppender/Source/_libs/LocalPolicy.pdb
similarity index 100%
rename from Windows/ArchiveCerts/SoftCertPolicyAppender/Source/_libs/LocalPolicy.pdb
rename to Windows/Tools/SoftCertPolicyAppender/Source/_libs/LocalPolicy.pdb
--
GitLab