From 87f0f7df83de7ec3fe55905800e1587bb6b55c95 Mon Sep 17 00:00:00 2001
From: chengr28 <chengr28@gmail.com>
Date: Tue, 2 Dec 2014 13:01:55 +0800
Subject: [PATCH] 2014-12-02

---
 ...{AntiChinaCerts.sh => RevokeChinaCerts.sh} |   4 +-
 README.md                                     |   5 +-
 Windows/{Certs => ArchiveCerts}/CFCA.crt      |   0
 .../{Certs => ArchiveCerts}/CFCA_CS_CA.crt    |   0
 .../{Certs => ArchiveCerts}/CFCA_RSA_RCA.crt  |   0
 .../{Certs => ArchiveCerts}/CFCA_Root_CA.crt  |   0
 .../{Certs => ArchiveCerts}/CFCA_SM2_RCA.crt  |   0
 .../{Certs => ArchiveCerts}/ROOTCA_NRCAC.crt  |   0
 ...SignTrust_Root_Certification_Authority.crt |  21 +++++++
 ...Trust_Root_Certification_Authority_G02.crt |  32 +++++++++++
 ..._201301.crt => [Fake]GitHubCom_201301.crt} |   0
 ..._201407.crt => [Fake]GoogleCom_201407.crt} |   0
 ..._201409.crt => [Fake]GoogleCom_201409.crt} |   0
 ..._201410.crt => [Fake]HotmaiCom_201410.crt} |   0
 ...10.crt => [Fake]WwwFacebookCom_201410.crt} |   0
 ...1410.crt => [Fake]WwwIcloudCom_201410.crt} |   0
 ...m_201409.crt => [Fake]YahooCom_201409.crt} |   0
 ...gent_CA.crt => [Suspicious]GoAgent_CA.crt} |   0
 ...duCom.crt => [Suspicious]WaccBaiduCom.crt} |   0
 ...cion_Raiz_del_Estado_Venezolano_200702.crt |  54 ++++++++++++++++++
 ...cion_Raiz_del_Estado_Venezolano_201012.crt |  54 ++++++++++++++++++
 .../{Certs => }/Microsoft_Fixit_20135.diagcab | Bin
 Windows/{Certs => }/Microsoft_Fixit_51014.msi | Bin
 ...Certs_All.bat => RevokeChinaCerts_All.bat} |  30 +++++++---
 ...rts_Base.bat => RevokeChinaCerts_Base.bat} |  16 +++---
 ...nded.bat => RevokeChinaCerts_Extended.bat} |  18 +++---
 ...store.bat => RevokeChinaCerts_Restore.bat} |  26 ++++++++-
 27 files changed, 229 insertions(+), 31 deletions(-)
 rename Mac/{AntiChinaCerts.sh => RevokeChinaCerts.sh} (64%)
 mode change 100755 => 100644
 rename Windows/{Certs => ArchiveCerts}/CFCA.crt (100%)
 rename Windows/{Certs => ArchiveCerts}/CFCA_CS_CA.crt (100%)
 rename Windows/{Certs => ArchiveCerts}/CFCA_RSA_RCA.crt (100%)
 rename Windows/{Certs => ArchiveCerts}/CFCA_Root_CA.crt (100%)
 rename Windows/{Certs => ArchiveCerts}/CFCA_SM2_RCA.crt (100%)
 rename Windows/{Certs => ArchiveCerts}/ROOTCA_NRCAC.crt (100%)
 create mode 100644 Windows/Certs/Macao_Post_eSignTrust_Root_Certification_Authority.crt
 create mode 100644 Windows/Certs/Macao_Post_eSignTrust_Root_Certification_Authority_G02.crt
 rename Windows/Certs/{Fake_GitHubCom_201301.crt => [Fake]GitHubCom_201301.crt} (100%)
 rename Windows/Certs/{Fake_GoogleCom_201407.crt => [Fake]GoogleCom_201407.crt} (100%)
 rename Windows/Certs/{Fake_GoogleCom_201409.crt => [Fake]GoogleCom_201409.crt} (100%)
 rename Windows/Certs/{Fake_HotmaiCom_201410.crt => [Fake]HotmaiCom_201410.crt} (100%)
 rename Windows/Certs/{Fake_WwwFacebookCom_201410.crt => [Fake]WwwFacebookCom_201410.crt} (100%)
 rename Windows/Certs/{Fake_WwwIcloudCom_201410.crt => [Fake]WwwIcloudCom_201410.crt} (100%)
 rename Windows/Certs/{Fake_YahooCom_201409.crt => [Fake]YahooCom_201409.crt} (100%)
 rename Windows/Certs/{Suspicious_GoAgent_CA.crt => [Suspicious]GoAgent_CA.crt} (100%)
 rename Windows/Certs/{Suspicious_WaccBaiduCom.crt => [Suspicious]WaccBaiduCom.crt} (100%)
 create mode 100644 Windows/ForeignCerts/Autoridad_de_Certificacion_Raiz_del_Estado_Venezolano_200702.crt
 create mode 100644 Windows/ForeignCerts/Autoridad_de_Certificacion_Raiz_del_Estado_Venezolano_201012.crt
 rename Windows/{Certs => }/Microsoft_Fixit_20135.diagcab (100%)
 rename Windows/{Certs => }/Microsoft_Fixit_51014.msi (100%)
 rename Windows/{AntiChinaCerts_All.bat => RevokeChinaCerts_All.bat} (92%)
 rename Windows/{AntiChinaCerts_Base.bat => RevokeChinaCerts_Base.bat} (91%)
 rename Windows/{AntiChinaCerts_Extended.bat => RevokeChinaCerts_Extended.bat} (94%)
 rename Windows/{AntiChinaCerts_Restore.bat => RevokeChinaCerts_Restore.bat} (78%)

diff --git a/Mac/AntiChinaCerts.sh b/Mac/RevokeChinaCerts.sh
old mode 100755
new mode 100644
similarity index 64%
rename from Mac/AntiChinaCerts.sh
rename to Mac/RevokeChinaCerts.sh
index bcb855f..2d63ed1
--- a/Mac/AntiChinaCerts.sh
+++ b/Mac/RevokeChinaCerts.sh
@@ -1,5 +1,5 @@
-# AntiChinaCerts Mac shell
-# Anti China Certifications.
+# RevokeChinaCerts Mac shell
+# Revoke China Certificates.
 # 
 # Author: QuantumGhost
 # 
diff --git a/README.md b/README.md
index 70f629e..0c7c424 100644
--- a/README.md
+++ b/README.md
@@ -4,13 +4,14 @@ Revoke China Certificates.<br />
 全自动可疑证书吊销工具/全自動可疑憑證撤銷工具<br />
 
 ### Updated
-**2014-11-28**
+**2014-12-02**
 
 ### Usage
 * [English version](https://github.com/chengr28/RevokeChinaCerts/wiki/ReadMe)
 * [简体中文使用说明](https://github.com/chengr28/RevokeChinaCerts/wiki/ReadMe(Chinese_Simplified))
 * [繁體中文使用說明](https://github.com/chengr28/RevokeChinaCerts/wiki/ReadMe(Chinese_Traditional))
 
-### 特别说明/特別說明
+### Special/特别说明/特別說明
+* **Extended** and **All** version will revoke `GoAgent CA` using in GoAgent. Please delete `CA.crt` and `certs` folder which in GoAgent program folder(if it exists). Finally, clear all browser(s) data and restart GoAgent.
 * **Extended** 版和 **All** 版会自动吊销 GoAgent 自带的 `GoAgent CA` 证书，为免使用 GoAgent 时出现错误同时也为了系统加密连接的安全强烈建议更换其自带的 CA 根证书。**关闭所有 GoAgent 程序，进入其 `local` 目录删除 `CA.crt` 以及整个 `certs` 目录，然后清空所有浏览器数据重启 GoAgent 和浏览器即可。**
 * **Extended** 版和 **All** 版會自動吊銷 GoAgent 自帶的 `GoAgent CA` 證書，為免使用 GoAgent 時出現錯誤同時也為了系統加密連接的安全強烈建議更換其自帶的 CA 根憑證。**關閉所有 GoAgent 程式，進入其 `local` 目錄刪除 `CA.crt` 以及整個 `certs` 目錄，然後清空所有瀏覽器資料重啟 GoAgent 和瀏覽器即可。**
diff --git a/Windows/Certs/CFCA.crt b/Windows/ArchiveCerts/CFCA.crt
similarity index 100%
rename from Windows/Certs/CFCA.crt
rename to Windows/ArchiveCerts/CFCA.crt
diff --git a/Windows/Certs/CFCA_CS_CA.crt b/Windows/ArchiveCerts/CFCA_CS_CA.crt
similarity index 100%
rename from Windows/Certs/CFCA_CS_CA.crt
rename to Windows/ArchiveCerts/CFCA_CS_CA.crt
diff --git a/Windows/Certs/CFCA_RSA_RCA.crt b/Windows/ArchiveCerts/CFCA_RSA_RCA.crt
similarity index 100%
rename from Windows/Certs/CFCA_RSA_RCA.crt
rename to Windows/ArchiveCerts/CFCA_RSA_RCA.crt
diff --git a/Windows/Certs/CFCA_Root_CA.crt b/Windows/ArchiveCerts/CFCA_Root_CA.crt
similarity index 100%
rename from Windows/Certs/CFCA_Root_CA.crt
rename to Windows/ArchiveCerts/CFCA_Root_CA.crt
diff --git a/Windows/Certs/CFCA_SM2_RCA.crt b/Windows/ArchiveCerts/CFCA_SM2_RCA.crt
similarity index 100%
rename from Windows/Certs/CFCA_SM2_RCA.crt
rename to Windows/ArchiveCerts/CFCA_SM2_RCA.crt
diff --git a/Windows/Certs/ROOTCA_NRCAC.crt b/Windows/ArchiveCerts/ROOTCA_NRCAC.crt
similarity index 100%
rename from Windows/Certs/ROOTCA_NRCAC.crt
rename to Windows/ArchiveCerts/ROOTCA_NRCAC.crt
diff --git a/Windows/Certs/Macao_Post_eSignTrust_Root_Certification_Authority.crt b/Windows/Certs/Macao_Post_eSignTrust_Root_Certification_Authority.crt
new file mode 100644
index 0000000..b69410f
--- /dev/null
+++ b/Windows/Certs/Macao_Post_eSignTrust_Root_Certification_Authority.crt
@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDZTCCAk2gAwIBAgIQQxFalh9lWtbwMxL97dC5dTANBgkqhkiG9w0BAQQFADBf
+MQswCQYDVQQGEwJNTzETMBEGA1UEChMKTWFjYW8gUG9zdDE7MDkGA1UEAxMyTWFj
+YW8gUG9zdCBlU2lnblRydXN0IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkw
+HhcNMDMwMTMwMDAwMDAwWhcNMTMwMTI5MjM1OTU5WjBfMQswCQYDVQQGEwJNTzET
+MBEGA1UEChMKTWFjYW8gUG9zdDE7MDkGA1UEAxMyTWFjYW8gUG9zdCBlU2lnblRy
+dXN0IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCiHLa4uLHNVEmDrjrHrYTQXf+Vq/X/ARte7yA+vYAg
+SSxosoMx7JUtbkmye79kn1ct1SJr7leXdIfq+1DNcuckLXBUvKTiKoW1AvmnYLZy
+WetRrEZK/Kd1+wTUAP/aDM7Lkw8yeXbWJuDNcg1L6iaPS3zW42JoiCbQTbeaJ5vA
+m7YSwZvsBNE12ie+MOJ9A85GOAhv4feeLA66CjHXwmpEhmfR6EmTFMDMXpGn+1a6
+gQA4bNKZwb9c6KTtSpzq4lK94/mL+ETmxEBBze8ATLnCqfwB9O7+sJEPgHG25ZFo
+ouVn1+jl6KPOdKxeF607EUQXXmV2siJNuAs76T+JafWzAgMBAAGjHTAbMAwGA1Ud
+EwQFMAMBAf8wCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBBAUAA4IBAQCglFEB2Mz7
+F37cnX7BiLJcF8+wxiTJNLAGZZkTVEWHF33ByC5hNO7GbcNNaqkeqz0jFOIFCJhV
+Ag68aYvXz09fJdBnuVY+S+tDgg3XKCvL7xGa8NpkaXDimCoAhm+Y6ksOmpyNvKpP
+uP1v+1Mkc6/Umbz1bsyWPtZd1zQ1aXmx0cp1ycCEvS5xpRqBkfwbicIyRzJ8aMG7
+VOIhgGz27mzGB5ZePcC5ajPEBXCpbJ7VbN7G9ZNnb5UJwGjl+OPhMuSjDWmhDapA
+wOOEocv9MS7QBpQ26KAh/3TdETdJJlFFT5ESIFbyvwH82fEXbpr4XBmcNCLEJtGF
+CITSCANIyhgG
+-----END CERTIFICATE-----
diff --git a/Windows/Certs/Macao_Post_eSignTrust_Root_Certification_Authority_G02.crt b/Windows/Certs/Macao_Post_eSignTrust_Root_Certification_Authority_G02.crt
new file mode 100644
index 0000000..2a0e788
--- /dev/null
+++ b/Windows/Certs/Macao_Post_eSignTrust_Root_Certification_Authority_G02.crt
@@ -0,0 +1,32 @@
+-----BEGIN CERTIFICATE-----
+MIIFljCCA36gAwIBAgIQUqy+BxFJl7sfv4cbJRe/pDANBgkqhkiG9w0BAQUFADBl
+MQswCQYDVQQGEwJNTzETMBEGA1UEChMKTWFjYW8gUG9zdDFBMD8GA1UEAxM4TWFj
+YW8gUG9zdCBlU2lnblRydXN0IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
+KEcwMikwHhcNMTAwMTA2MDAwMDAwWhcNMjAwMTA1MjM1OTU5WjBlMQswCQYDVQQG
+EwJNTzETMBEGA1UEChMKTWFjYW8gUG9zdDFBMD8GA1UEAxM4TWFjYW8gUG9zdCBl
+U2lnblRydXN0IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgKEcwMikwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2+IendMxdI16uq5bc1yQoHaQU
+ZtegaIxenUXU1CnTswvrrRbqnVIRyaThcOXdvg4cEXfrn6NweBePuT4XU2mp6/VV
++ZWX6d85dp4fUhe0GwAS0M0846pJ0Z5BNzb1Yc0jD1ex9k3T2w1CUwKI9PCphotX
+z3IK1ZRLWto35T1HWWe+045W1Vc50Cfbn0lPqBZUv3hfzxydXqELjIMDswwUyVqp
+u//GrlnP9WUfI4kBU4rVWxedm/+YUQ9DSfeqLO3l6YY6M1Bz3FKla2OE6ROifMd3
+GvOqqQ0LTk4dRMNyO5lZ50EiOyxUXhIxlmhBGdXtdae5V1sR9pqkSS9i8wuYURuz
+M0LSzNRhGcPT3Jv7k7JizTb7jOkabhqxOSSOXdk+O4Z8iOa3JwP4lVGwv1A3/vhO
+EwEbJy2bktByV9ejmlboa6P3Vd5AXeIIH1y7UaaetN0OphpZYmeGcxCVnZXNur/Y
+nCoOi3aZk9RLsOhUPw3YivmAz0H9AXpFfH3WPU75Yk9BJXyqbVhWGwe0c6ofER88
+ulMj4O1KzZaJ3EjQTWLLkwf2oK5TF3xfXAccBUyrTGqqwg+gGWt5ecJ8s6n9PfvM
+fHHFu74lbSGn+9a+YPO1qalsdBg/qJ5CYEHyOS0dwg1z8uCxtkoaGL13aRnX0nqx
+3JY1mtgmhYO2EynC4wIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB
+/wQEAwIBBjAdBgNVHQ4EFgQUAoG3tmb4kkVtwnHSn+wv07ofuf8wDQYJKoZIhvcN
+AQEFBQADggIBAFhTi77PQbJPttXeSmjNZc/GQIqsS5pbY2298T9ZUELQ35rjX1aR
+s1ub2UUGQ++TG/0zdx0GVDhI8VSMOlNrO3E1CXZl6VcPQ/aRmt4Qu7pokioly2dE
+CWu/nZdmy6lFtr43mR11Jb49PGNsv6kTR8dyjMvDz/T2hwWZiReoNCDx36EnZ9On
+I++rWYM9GtgqzcKtSjAMBjogi6T42kY3Qy60iR2Ec4pgvmQxJ0LA63JhbczefHMr
+6L85Ql55keyAG6o2dk4h6IYElwkoy0fnQNQsXhpeSPqux+kE6kckm77xR57V1XrR
+XtSF8gsjBJjUK5pWckZMQZoz8JK0v0HUvZuws/H1E9avW9Ty0UHwR116vHpZ8X1g
+aJQOSk+BkiKqH8Q8vhw6OkzwcKF/u5/c0sWk8SZu4fMmqXD78YmWYhVcWaC1I/qW
+arIakj0NJEoruAj+b9/cwu6W/86/e7j5hO9BO+RNuYeRusZfyO3wy4vTD5H2IN6R
+mMbnSGTRzlMS7sQVbdyAUBsTYE95W/wanP6in6ARM5HJS206ZpYt0zj42ZmBtEQm
+f7HnnnBtHW31IgnkrBk2+ycF2Hqb2byeG9oZN9jx3RWYZBuPU/AonawUul9pz5Yj
+7lasmc06j9VeGeZiEzpf64tfFsA74dGTj1ZhNwXQeRv9qLwPedKz5tNm
+-----END CERTIFICATE-----
diff --git a/Windows/Certs/Fake_GitHubCom_201301.crt b/Windows/Certs/[Fake]GitHubCom_201301.crt
similarity index 100%
rename from Windows/Certs/Fake_GitHubCom_201301.crt
rename to Windows/Certs/[Fake]GitHubCom_201301.crt
diff --git a/Windows/Certs/Fake_GoogleCom_201407.crt b/Windows/Certs/[Fake]GoogleCom_201407.crt
similarity index 100%
rename from Windows/Certs/Fake_GoogleCom_201407.crt
rename to Windows/Certs/[Fake]GoogleCom_201407.crt
diff --git a/Windows/Certs/Fake_GoogleCom_201409.crt b/Windows/Certs/[Fake]GoogleCom_201409.crt
similarity index 100%
rename from Windows/Certs/Fake_GoogleCom_201409.crt
rename to Windows/Certs/[Fake]GoogleCom_201409.crt
diff --git a/Windows/Certs/Fake_HotmaiCom_201410.crt b/Windows/Certs/[Fake]HotmaiCom_201410.crt
similarity index 100%
rename from Windows/Certs/Fake_HotmaiCom_201410.crt
rename to Windows/Certs/[Fake]HotmaiCom_201410.crt
diff --git a/Windows/Certs/Fake_WwwFacebookCom_201410.crt b/Windows/Certs/[Fake]WwwFacebookCom_201410.crt
similarity index 100%
rename from Windows/Certs/Fake_WwwFacebookCom_201410.crt
rename to Windows/Certs/[Fake]WwwFacebookCom_201410.crt
diff --git a/Windows/Certs/Fake_WwwIcloudCom_201410.crt b/Windows/Certs/[Fake]WwwIcloudCom_201410.crt
similarity index 100%
rename from Windows/Certs/Fake_WwwIcloudCom_201410.crt
rename to Windows/Certs/[Fake]WwwIcloudCom_201410.crt
diff --git a/Windows/Certs/Fake_YahooCom_201409.crt b/Windows/Certs/[Fake]YahooCom_201409.crt
similarity index 100%
rename from Windows/Certs/Fake_YahooCom_201409.crt
rename to Windows/Certs/[Fake]YahooCom_201409.crt
diff --git a/Windows/Certs/Suspicious_GoAgent_CA.crt b/Windows/Certs/[Suspicious]GoAgent_CA.crt
similarity index 100%
rename from Windows/Certs/Suspicious_GoAgent_CA.crt
rename to Windows/Certs/[Suspicious]GoAgent_CA.crt
diff --git a/Windows/Certs/Suspicious_WaccBaiduCom.crt b/Windows/Certs/[Suspicious]WaccBaiduCom.crt
similarity index 100%
rename from Windows/Certs/Suspicious_WaccBaiduCom.crt
rename to Windows/Certs/[Suspicious]WaccBaiduCom.crt
diff --git a/Windows/ForeignCerts/Autoridad_de_Certificacion_Raiz_del_Estado_Venezolano_200702.crt b/Windows/ForeignCerts/Autoridad_de_Certificacion_Raiz_del_Estado_Venezolano_200702.crt
new file mode 100644
index 0000000..5ed9819
--- /dev/null
+++ b/Windows/ForeignCerts/Autoridad_de_Certificacion_Raiz_del_Estado_Venezolano_200702.crt
@@ -0,0 +1,54 @@
+-----BEGIN CERTIFICATE-----
+MIIJmzCCB4OgAwIBAgIBATANBgkqhkiG9w0BAQUFADCCAR4xPjA8BgNVBAMTNUF1
+dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIFJhaXogZGVsIEVzdGFkbyBWZW5lem9s
+YW5vMQswCQYDVQQGEwJWRTEQMA4GA1UEBxMHQ2FyYWNhczEZMBcGA1UECBMQRGlz
+dHJpdG8gQ2FwaXRhbDE2MDQGA1UEChMtU2lzdGVtYSBOYWNpb25hbCBkZSBDZXJ0
+aWZpY2FjaW9uIEVsZWN0cm9uaWNhMUMwQQYDVQQLEzpTdXBlcmludGVuZGVuY2lh
+IGRlIFNlcnZpY2lvcyBkZSBDZXJ0aWZpY2FjaW9uIEVsZWN0cm9uaWNhMSUwIwYJ
+KoZIhvcNAQkBFhZhY3JhaXpAc3VzY2VydGUuZ29iLnZlMB4XDTA3MDIxNjE1MzU1
+MVoXDTI3MDIxMTIzNTk1OVowggEeMT4wPAYDVQQDEzVBdXRvcmlkYWQgZGUgQ2Vy
+dGlmaWNhY2lvbiBSYWl6IGRlbCBFc3RhZG8gVmVuZXpvbGFubzELMAkGA1UEBhMC
+VkUxEDAOBgNVBAcTB0NhcmFjYXMxGTAXBgNVBAgTEERpc3RyaXRvIENhcGl0YWwx
+NjA0BgNVBAoTLVNpc3RlbWEgTmFjaW9uYWwgZGUgQ2VydGlmaWNhY2lvbiBFbGVj
+dHJvbmljYTFDMEEGA1UECxM6U3VwZXJpbnRlbmRlbmNpYSBkZSBTZXJ2aWNpb3Mg
+ZGUgQ2VydGlmaWNhY2lvbiBFbGVjdHJvbmljYTElMCMGCSqGSIb3DQEJARYWYWNy
+YWl6QHN1c2NlcnRlLmdvYi52ZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
+ggIBALcok9KOeQsz+FEa+MXGdAJVJN63wozmjcrg6uCuKguU9VhnC1UzxQjFsUze
+rnpGVwX2QYVnA0NJxyzm9fWMSkimcynnpO85uHeFyk8M1DT7WBR8REn50eK9MqVo
+8tNXAS80lUxxGdm7dbKY4iL9TL8megLnfNBNSUUaLeq11d1NL47W/uW9+hAzWlu6
+aPt3cc/Fpd01XMlGL/K0w9NB5Tv9KQWDerAH6QWIKjMkmxmeQ5USojV55hztS1gP
+snlcPWk+5oPC9H/MkZxTPn8JK9ATXcOpFMAwNn9jgJL7BMljYzV/cZFHS03aurrz
+fnb+hI3leMTpCzlnbFAR/eUSN2JIyu/blsHu3S5aXQiDVxNb+q7NCMqACeza38Zd
+6ONTyaD8gvAV6JR9rY6wB3SqKWr5Nef0wMn9/EJoGhfTli5SIjYmfjYKWj5gzrDU
++vM3gHnlFix6hiskajdswgLEoK+PG7onW2ar6CQpay/U68FcDsn2jIDHhxAIaZIS
+K6FoecIYvZX6P8SlemDBMxuMaepXR9dFHM9hpyCaqzXbume4bscS8paLWQwMduil
+oQjOEP0Ocl7Fnuk4w2Kvek+aL69s0ykp6yPoGs0y03S83FmLfwtIt4rT5LfUYQv9
+3dDBluLOt++Elw3A3HbajirVPI4lzsLFlirwUXqm/Wf7Gy6PAgMBAAGjggLeMIIC
+2jASBgNVHRMBAf8ECDAGAQH/AgECMDcGA1UdEgQwMC6CD3N1c2NlcnRlLmdvYi52
+ZaAbBgVghl4CAqASDBBSSUYtRy0yMDAwNDAzNi0wMB0GA1UdDgQWBBRmDZwMrrrR
+SkMD7hObbfHS1HLVmjCCAVAGA1UdIwSCAUcwggFDgBRmDZwMrrrRSkMD7hObbfHS
+1HLVmqGCASakggEiMIIBHjE+MDwGA1UEAxM1QXV0b3JpZGFkIGRlIENlcnRpZmlj
+YWNpb24gUmFpeiBkZWwgRXN0YWRvIFZlbmV6b2xhbm8xCzAJBgNVBAYTAlZFMRAw
+DgYDVQQHEwdDYXJhY2FzMRkwFwYDVQQIExBEaXN0cml0byBDYXBpdGFsMTYwNAYD
+VQQKEy1TaXN0ZW1hIE5hY2lvbmFsIGRlIENlcnRpZmljYWNpb24gRWxlY3Ryb25p
+Y2ExQzBBBgNVBAsTOlN1cGVyaW50ZW5kZW5jaWEgZGUgU2VydmljaW9zIGRlIENl
+cnRpZmljYWNpb24gRWxlY3Ryb25pY2ExJTAjBgkqhkiG9w0BCQEWFmFjcmFpekBz
+dXNjZXJ0ZS5nb2IudmWCAQEwDgYDVR0PAQH/BAQDAgEGMDcGA1UdEQQwMC6CD3N1
+c2NlcnRlLmdvYi52ZaAbBgVghl4CAqASDBBSSUYtRy0yMDAwNDAzNi0wMFQGA1Ud
+HwRNMEswJKAioCCGHmh0dHA6Ly93d3cuc3VzY2VydGUuZ29iLnZlL2xjcjAjoCGg
+H4YdbGRhcDovL2FjcmFpei5zdXNjZXJ0ZS5nb2IudmUwNwYIKwYBBQUHAQEEKzAp
+MCcGCCsGAQUFBzABhhtodHRwOi8vb2NzcC5zdXNjZXJ0ZS5nb2IudmUwQAYDVR0g
+BDkwNzA1BgVghl4BAjAsMCoGCCsGAQUFBwIBFh5odHRwOi8vd3d3LnN1c2NlcnRl
+LmdvYi52ZS9kcGMwDQYJKoZIhvcNAQEFBQADggIBAIIZ7DHkEaEoHIGrJR44YAjG
+9wyGXUMOpagwfBUyBmrhUc2sARNuBhmQJkhYGUUnLwDuDZFx7Y3FwjcZoEYzls1n
+KJM689/pTskFl4gk6xZnRVl8imf2j8P1jWBVzQ+B2AFuuIE0VVHxkya577LkieqR
+5AcTbV+93DRdvy/tsgpNaEUdKQmIgZTb+HbzEUxJHNLJSyqctDuTAZi66gQGG/im
+kSu4raQHHdvcK8XmUoMwwzdhG/vKv6sAfvKTS+lAlZA73lZx8n/0A9wGz8fpEd0A
+dhhUDH3SAxyETKkrtNp2dsv0E2jbEvC6piAUoYvaJcGhZMMxq4dmAxzzwGFhilxR
+xDwv4RYJjxV9xHlRmHzViwVI1/NB7Ob8d5bIDc7w417eSIuel//xAIC8ufVzPsoM
+/12n3mheMLinbec52N0/Wi/gZKbVANl0e/1vWbPd6okO/ou7QE/PGk4aHwq8rA+U
+72NM6WATAicV+rZkR0/qlDVkgfWeIg/Spl5/kqrzAHHwT3YQCNEFZGnPy6sVqPbX
+DQnG50JaARYKLm8z3akalf8gjY5UIJ3PHb39JIqpIKRwU84Q/1RIsqJo9HELd3zM
+rtcHFBfTfa7dx3DPYo30r4mE7LNT9gZ5f9+Ct8eOAvbQ3WoubQGG5r55+c7FZAU2
+EHgFy96xE/FAndEXR872
+-----END CERTIFICATE-----
diff --git a/Windows/ForeignCerts/Autoridad_de_Certificacion_Raiz_del_Estado_Venezolano_201012.crt b/Windows/ForeignCerts/Autoridad_de_Certificacion_Raiz_del_Estado_Venezolano_201012.crt
new file mode 100644
index 0000000..4285736
--- /dev/null
+++ b/Windows/ForeignCerts/Autoridad_de_Certificacion_Raiz_del_Estado_Venezolano_201012.crt
@@ -0,0 +1,54 @@
+-----BEGIN CERTIFICATE-----
+MIIJmDCCB4CgAwIBAgIBCjANBgkqhkiG9w0BAQwFADCCAR4xPjA8BgNVBAMTNUF1
+dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIFJhaXogZGVsIEVzdGFkbyBWZW5lem9s
+YW5vMQswCQYDVQQGEwJWRTEQMA4GA1UEBxMHQ2FyYWNhczEZMBcGA1UECBMQRGlz
+dHJpdG8gQ2FwaXRhbDE2MDQGA1UEChMtU2lzdGVtYSBOYWNpb25hbCBkZSBDZXJ0
+aWZpY2FjaW9uIEVsZWN0cm9uaWNhMUMwQQYDVQQLEzpTdXBlcmludGVuZGVuY2lh
+IGRlIFNlcnZpY2lvcyBkZSBDZXJ0aWZpY2FjaW9uIEVsZWN0cm9uaWNhMSUwIwYJ
+KoZIhvcNAQkBFhZhY3JhaXpAc3VzY2VydGUuZ29iLnZlMB4XDTEwMTIyODE2NDEz
+NloXDTMwMTIyMzIzNTk1OVowggEeMT4wPAYDVQQDEzVBdXRvcmlkYWQgZGUgQ2Vy
+dGlmaWNhY2lvbiBSYWl6IGRlbCBFc3RhZG8gVmVuZXpvbGFubzELMAkGA1UEBhMC
+VkUxEDAOBgNVBAcTB0NhcmFjYXMxGTAXBgNVBAgTEERpc3RyaXRvIENhcGl0YWwx
+NjA0BgNVBAoTLVNpc3RlbWEgTmFjaW9uYWwgZGUgQ2VydGlmaWNhY2lvbiBFbGVj
+dHJvbmljYTFDMEEGA1UECxM6U3VwZXJpbnRlbmRlbmNpYSBkZSBTZXJ2aWNpb3Mg
+ZGUgQ2VydGlmaWNhY2lvbiBFbGVjdHJvbmljYTElMCMGCSqGSIb3DQEJARYWYWNy
+YWl6QHN1c2NlcnRlLmdvYi52ZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
+ggIBAME77xNS8ZlW47RsBeEaaRZhJoZ4rw785UAFCuPZOAVMqNS1wMYqzy95q6Gk
+UO81ER/ugiQX/KMcq/4HBn83fwdYWxPZfwBfK7BP2p/JsFgzYeFP0BXOLmvoJIzl
+Jb6FW+1MPwGBjuaZGFImWZsSmGUclb51mRYMZETh9/J5CLThR1exStxHQptwSzra
+zNFpkQY/zmj7+YZNA9yDoroVFv6sybYOZ7OxNDo7zkSLo45I7gMwtxqWZ8VkJZkC
+8+p0dX6mkhUT0QAV64Zc9HsZiH/oLhEkXjhrgZ28cF73MXIqLx1fyM4kPH1yOJi/
+R72nMwL7D+Sd6mZgI035TxuHXc2/uOwXfKrrTjaJDz8Jp6DdessOkxIgkKXRjP+F
+K3ze3n4NUIRGhGRtyvEjK95/2g02t6PeYiYVGur6ruS49n0RAaSS0/LJb6XzaAAe
+0mmO2evnEqxIKwy2mZRNPfAVW1l3wCnWiUwryBU6OsbFcFFrQm+00wOicXvOTHBM
+aiCVAVZTb9RSLyi+LJ1llzJZO3pq3IRiiBj38Nooo+2ZNbMEciSgmig7YXaUcmud
+SVQvLSL+Yw+SqawyezwZuASbp7d/0rutQ59d81zlbMt3J7yB567rT2IqIydQ8qBW
+k+fmXzghX+/FidYsh/aK+zZ7Wy68kKHuzEw1Vqkat5DGs+VzAgMBAAGjggLbMIIC
+1zASBgNVHRMBAf8ECDAGAQH/AgECMDcGA1UdEgQwMC6CD3N1c2NlcnRlLmdvYi52
+ZaAbBgVghl4CAqASDBBSSUYtRy0yMDAwNDAzNi0wMB0GA1UdDgQWBBStuyIdxuDS
+Aaj9dlBSk+2YwU2u0zCCAVAGA1UdIwSCAUcwggFDgBStuyIdxuDSAaj9dlBSk+2Y
+wU2u06GCASakggEiMIIBHjE+MDwGA1UEAxM1QXV0b3JpZGFkIGRlIENlcnRpZmlj
+YWNpb24gUmFpeiBkZWwgRXN0YWRvIFZlbmV6b2xhbm8xCzAJBgNVBAYTAlZFMRAw
+DgYDVQQHEwdDYXJhY2FzMRkwFwYDVQQIExBEaXN0cml0byBDYXBpdGFsMTYwNAYD
+VQQKEy1TaXN0ZW1hIE5hY2lvbmFsIGRlIENlcnRpZmljYWNpb24gRWxlY3Ryb25p
+Y2ExQzBBBgNVBAsTOlN1cGVyaW50ZW5kZW5jaWEgZGUgU2VydmljaW9zIGRlIENl
+cnRpZmljYWNpb24gRWxlY3Ryb25pY2ExJTAjBgkqhkiG9w0BCQEWFmFjcmFpekBz
+dXNjZXJ0ZS5nb2IudmWCAQowCwYDVR0PBAQDAgEGMDcGA1UdEQQwMC6CD3N1c2Nl
+cnRlLmdvYi52ZaAbBgVghl4CAqASDBBSSUYtRy0yMDAwNDAzNi0wMFQGA1UdHwRN
+MEswJKAioCCGHmh0dHA6Ly93d3cuc3VzY2VydGUuZ29iLnZlL2xjcjAjoCGgH4Yd
+bGRhcDovL2FjcmFpei5zdXNjZXJ0ZS5nb2IudmUwNwYIKwYBBQUHAQEEKzApMCcG
+CCsGAQUFBzABhhtodHRwOi8vb2NzcC5zdXNjZXJ0ZS5nb2IudmUwQAYDVR0gBDkw
+NzA1BgVghl4BAjAsMCoGCCsGAQUFBwIBFh5odHRwOi8vd3d3LnN1c2NlcnRlLmdv
+Yi52ZS9kcGMwDQYJKoZIhvcNAQEMBQADggIBABxZEOVepFHBR7tlsgtV4i+poye8
+4TyKx2wDVqOpKaKbipXYH/e2EmAWvnr0/QOBT/2BgapPgXAeLu/AkhJ7uw+FiMT5
+HUG1uiQqwygmE8r5APvXw1z5aOkbwRgiyaJsZMP4OcNOId3Wwt7ltizJXDjw3l5q
+5Cf0uDPEy2GSM1OozPydzVP7KAvv7X+wj3QitjVXgKiuBa4pCjuypP0949TBkPY/
+zrzkRP7RwX4oL/0AJDIgiMRvGHuRDkiQvJZiYIFtFAAaUbq1XWmNYUccLKxORSCp
+SEWjh0mjeJDdNkJ/2HZv/W2DAcb5f5ggf5YuImCroifAsDUk0Mm/M5kiUw5uH2JM
+JvwkM8rBA8ypF2FjMyTMaEDvr6LihcOIMNNFG+5W6lYKDwpHmzBZ2EnRMJAMJyom
+CChcMh8n160LSeUXUWPP5g07YFEavUMJUOaRtWPmZJeqC5cTAQaGXKUflb5Qjguy
+0mR/26tM5kPG5IWNav6N/ruUVR6RUycI07pnPTqhycHFFLr5Q1zFjiGMgqL9KjIl
+1RaMFVbAmPwuso4ZpBZxw0vdcf5x7CId8MGMmIGHtL8CuMQwMUfCwLCvezNjCt2s
+RZvBzICH9NmYXpyG/poE/2ZK/HthVL5XYwUHxqcBdVnkbjk7APSqnfOfiL/P0SUr
+339z7RaGqZBlD3Ap
+-----END CERTIFICATE-----
diff --git a/Windows/Certs/Microsoft_Fixit_20135.diagcab b/Windows/Microsoft_Fixit_20135.diagcab
similarity index 100%
rename from Windows/Certs/Microsoft_Fixit_20135.diagcab
rename to Windows/Microsoft_Fixit_20135.diagcab
diff --git a/Windows/Certs/Microsoft_Fixit_51014.msi b/Windows/Microsoft_Fixit_51014.msi
similarity index 100%
rename from Windows/Certs/Microsoft_Fixit_51014.msi
rename to Windows/Microsoft_Fixit_51014.msi
diff --git a/Windows/AntiChinaCerts_All.bat b/Windows/RevokeChinaCerts_All.bat
similarity index 92%
rename from Windows/AntiChinaCerts_All.bat
rename to Windows/RevokeChinaCerts_All.bat
index c4e2704..367c927 100644
--- a/Windows/AntiChinaCerts_All.bat
+++ b/Windows/RevokeChinaCerts_All.bat
@@ -208,6 +208,16 @@ if "%PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432%" == "x86" set CertMgr=%Cert
 %CertMgr% -del -c -sha1 D6DAA8208D09D2154D24B52FCB346EB258B28A58 -s -r localMachine AuthRoot
 %CertMgr% -del -c -sha1 D6DAA8208D09D2154D24B52FCB346EB258B28A58 -s -r CurrentUser Root
 %CertMgr% -del -c -sha1 D6DAA8208D09D2154D24B52FCB346EB258B28A58 -s -r CurrentUser AuthRoot
+::  Macao Post eSignTrust Root Certification Authority
+%CertMgr% -del -c -sha1 89C32E6B524E4D65388B9ECEDC637134ED4193A3 -s -r localMachine Root
+%CertMgr% -del -c -sha1 89C32E6B524E4D65388B9ECEDC637134ED4193A3 -s -r localMachine AuthRoot
+%CertMgr% -del -c -sha1 89C32E6B524E4D65388B9ECEDC637134ED4193A3 -s -r CurrentUser Root
+%CertMgr% -del -c -sha1 89C32E6B524E4D65388B9ECEDC637134ED4193A3 -s -r CurrentUser AuthRoot
+::  Macao Post eSignTrust Root Certification Authority(G02)
+%CertMgr% -del -c -sha1 06143151E02B45DDBADD5D8E56530DAAE328CF90 -s -r localMachine Root
+%CertMgr% -del -c -sha1 06143151E02B45DDBADD5D8E56530DAAE328CF90 -s -r localMachine AuthRoot
+%CertMgr% -del -c -sha1 06143151E02B45DDBADD5D8E56530DAAE328CF90 -s -r CurrentUser Root
+%CertMgr% -del -c -sha1 06143151E02B45DDBADD5D8E56530DAAE328CF90 -s -r CurrentUser AuthRoot
 ::  ePKI Root Certificate Authority
 %CertMgr% -del -c -sha1 67650DF17E8E7E5B8240A4F4564BCFE23D69C6F0 -s -r localMachine Root
 %CertMgr% -del -c -sha1 67650DF17E8E7E5B8240A4F4564BCFE23D69C6F0 -s -r localMachine AuthRoot
@@ -246,17 +256,17 @@ if "%PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432%" == "x86" set CertMgr=%Cert
 @echo.
 
 :: Add certificates to CRL(Base part)
-%CertMgr% -add -c Fake_GitHubCom_201301.crt -s Disallowed
-%CertMgr% -add -c Fake_GoogleCom_201407.crt -s Disallowed
-%CertMgr% -add -c Fake_GoogleCom_201409.crt -s Disallowed
-%CertMgr% -add -c Fake_YahooCom_201409.crt -s Disallowed
-%CertMgr% -add -c Fake_HotmaiCom_201410.crt -s Disallowed
-%CertMgr% -add -c Fake_WwwFacebookCom_201410.crt -s Disallowed
-%CertMgr% -add -c Fake_WwwIcloudCom_201410.crt -s Disallowed
+%CertMgr% -add -c [Fake]GitHubCom_201301.crt -s Disallowed
+%CertMgr% -add -c [Fake]GoogleCom_201407.crt -s Disallowed
+%CertMgr% -add -c [Fake]GoogleCom_201409.crt -s Disallowed
+%CertMgr% -add -c [Fake]YahooCom_201409.crt -s Disallowed
+%CertMgr% -add -c [Fake]HotmaiCom_201410.crt -s Disallowed
+%CertMgr% -add -c [Fake]WwwFacebookCom_201410.crt -s Disallowed
+%CertMgr% -add -c [Fake]WwwIcloudCom_201410.crt -s Disallowed
 %CertMgr% -add -c CNNIC_ROOT.crt -s Disallowed
 %CertMgr% -add -c China_Internet_Network_Information_Center_EV_Certificates_Root.crt -s Disallowed
 %CertMgr% -add -c CNNIC_SSL_Entrust.crt -s Disallowed
-%CertMgr% -add -c Suspicious_WaccBaiduCom.crt -s Disallowed
+%CertMgr% -add -c [Suspicious]WaccBaiduCom.crt -s Disallowed
 :: Add certificates to CRL(Extended part)
 %CertMgr% -add -c CFCA_GT_CA_201106.crt -s Disallowed
 %CertMgr% -add -c CFCA_GT_CA_201208.crt -s Disallowed
@@ -265,7 +275,7 @@ if "%PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432%" == "x86" set CertMgr=%Cert
 %CertMgr% -add -c UCA_Root_200401.crt -s Disallowed
 %CertMgr% -add -c UCA_Extended_Validation_Root.crt -s Disallowed
 %CertMgr% -add -c UCA_ROOT_200101.crt -s Disallowed
-%CertMgr% -add -c Suspicious_GoAgent_CA.crt -s Disallowed
+%CertMgr% -add -c [Suspicious]GoAgent_CA.crt -s Disallowed
 %CertMgr% -add -c SZCA.crt -s Disallowed
 %CertMgr% -add -c SZCA_200307.crt -s Disallowed
 :: Add certificates to CRL(All part)
@@ -287,6 +297,8 @@ if "%PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432%" == "x86" set CertMgr=%Cert
 %CertMgr% -add -c China_Trust_Network_3.crt -s Disallowed
 %CertMgr% -add -c Hongkong_Post_Root_CA.crt -s Disallowed
 %CertMgr% -add -c Hongkong_Post_Root_CA_1.crt -s Disallowed
+%CertMgr% -add -c Macao_Post_eSignTrust_Root_Certification_Authority.crt -s Disallowed
+%CertMgr% -add -c Macao_Post_eSignTrust_Root_Certification_Authority_G02.crt -s Disallowed
 %CertMgr% -add -c ePKI_Root_Certificate_Authority.crt -s Disallowed
 %CertMgr% -add -c Government_Root_Certificate_Authority.crt -s Disallowed
 %CertMgr% -add -c TWCA_Global_Root_CA.crt -s Disallowed
diff --git a/Windows/AntiChinaCerts_Base.bat b/Windows/RevokeChinaCerts_Base.bat
similarity index 91%
rename from Windows/AntiChinaCerts_Base.bat
rename to Windows/RevokeChinaCerts_Base.bat
index 5b541b4..9c47666 100644
--- a/Windows/AntiChinaCerts_Base.bat
+++ b/Windows/RevokeChinaCerts_Base.bat
@@ -84,17 +84,17 @@ if "%PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432%" == "x86" set CertMgr=%Cert
 @echo.
 
 :: Add certificates to CRL(Base part)
-%CertMgr% -add -c Fake_GitHubCom_201301.crt -s Disallowed
-%CertMgr% -add -c Fake_GoogleCom_201407.crt -s Disallowed
-%CertMgr% -add -c Fake_GoogleCom_201409.crt -s Disallowed
-%CertMgr% -add -c Fake_YahooCom_201409.crt -s Disallowed
-%CertMgr% -add -c Fake_HotmaiCom_201410.crt -s Disallowed
-%CertMgr% -add -c Fake_WwwFacebookCom_201410.crt -s Disallowed
-%CertMgr% -add -c Fake_WwwIcloudCom_201410.crt -s Disallowed
+%CertMgr% -add -c [Fake]GitHubCom_201301.crt -s Disallowed
+%CertMgr% -add -c [Fake]GoogleCom_201407.crt -s Disallowed
+%CertMgr% -add -c [Fake]GoogleCom_201409.crt -s Disallowed
+%CertMgr% -add -c [Fake]YahooCom_201409.crt -s Disallowed
+%CertMgr% -add -c [Fake]HotmaiCom_201410.crt -s Disallowed
+%CertMgr% -add -c [Fake]WwwFacebookCom_201410.crt -s Disallowed
+%CertMgr% -add -c [Fake]WwwIcloudCom_201410.crt -s Disallowed
 %CertMgr% -add -c CNNIC_ROOT.crt -s Disallowed
 %CertMgr% -add -c China_Internet_Network_Information_Center_EV_Certificates_Root.crt -s Disallowed
 %CertMgr% -add -c CNNIC_SSL_Entrust.crt -s Disallowed
-%CertMgr% -add -c Suspicious_WaccBaiduCom.crt -s Disallowed
+%CertMgr% -add -c [Suspicious]WaccBaiduCom.crt -s Disallowed
 
 :Exit
 :: Print to screen.
diff --git a/Windows/AntiChinaCerts_Extended.bat b/Windows/RevokeChinaCerts_Extended.bat
similarity index 94%
rename from Windows/AntiChinaCerts_Extended.bat
rename to Windows/RevokeChinaCerts_Extended.bat
index 437b633..0714611 100644
--- a/Windows/AntiChinaCerts_Extended.bat
+++ b/Windows/RevokeChinaCerts_Extended.bat
@@ -136,17 +136,17 @@ if "%PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432%" == "x86" set CertMgr=%Cert
 @echo.
 
 :: Add certificates to CRL(Base part)
-%CertMgr% -add -c Fake_GitHubCom_201301.crt -s Disallowed
-%CertMgr% -add -c Fake_GoogleCom_201407.crt -s Disallowed
-%CertMgr% -add -c Fake_GoogleCom_201409.crt -s Disallowed
-%CertMgr% -add -c Fake_YahooCom_201409.crt -s Disallowed
-%CertMgr% -add -c Fake_HotmaiCom_201410.crt -s Disallowed
-%CertMgr% -add -c Fake_WwwFacebookCom_201410.crt -s Disallowed
-%CertMgr% -add -c Fake_WwwIcloudCom_201410.crt -s Disallowed
+%CertMgr% -add -c [Fake]GitHubCom_201301.crt -s Disallowed
+%CertMgr% -add -c [Fake]GoogleCom_201407.crt -s Disallowed
+%CertMgr% -add -c [Fake]GoogleCom_201409.crt -s Disallowed
+%CertMgr% -add -c [Fake]YahooCom_201409.crt -s Disallowed
+%CertMgr% -add -c [Fake]HotmaiCom_201410.crt -s Disallowed
+%CertMgr% -add -c [Fake]WwwFacebookCom_201410.crt -s Disallowed
+%CertMgr% -add -c [Fake]WwwIcloudCom_201410.crt -s Disallowed
 %CertMgr% -add -c CNNIC_ROOT.crt -s Disallowed
 %CertMgr% -add -c China_Internet_Network_Information_Center_EV_Certificates_Root.crt -s Disallowed
 %CertMgr% -add -c CNNIC_SSL_Entrust.crt -s Disallowed
-%CertMgr% -add -c Suspicious_WaccBaiduCom.crt -s Disallowed
+%CertMgr% -add -c [Suspicious]WaccBaiduCom.crt -s Disallowed
 :: Add certificates to CRL(Extended part)
 ::  Move to All version.
 ::  %CertMgr% -add -c ROOTCA.crt -s Disallowed
@@ -157,7 +157,7 @@ if "%PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432%" == "x86" set CertMgr=%Cert
 %CertMgr% -add -c UCA_Root_200401.crt -s Disallowed
 %CertMgr% -add -c UCA_Extended_Validation_Root.crt -s Disallowed
 %CertMgr% -add -c UCA_ROOT_200101.crt -s Disallowed
-%CertMgr% -add -c Suspicious_GoAgent_CA.crt -s Disallowed
+%CertMgr% -add -c [Suspicious]GoAgent_CA.crt -s Disallowed
 %CertMgr% -add -c SZCA.crt -s Disallowed
 %CertMgr% -add -c SZCA_200307.crt -s Disallowed
 
diff --git a/Windows/AntiChinaCerts_Restore.bat b/Windows/RevokeChinaCerts_Restore.bat
similarity index 78%
rename from Windows/AntiChinaCerts_Restore.bat
rename to Windows/RevokeChinaCerts_Restore.bat
index 96a6200..c1919a4 100644
--- a/Windows/AntiChinaCerts_Restore.bat
+++ b/Windows/RevokeChinaCerts_Restore.bat
@@ -87,7 +87,7 @@ if "%PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432%" == "x86" set CertMgr=%Cert
 %CertMgr% -del -c -sha1 6A174570A916FBE84453EED3D070A1D8DA442829 -s Disallowed
 ::  Certificate Authority of WoSign(StartCom)
 %CertMgr% -del -c -sha1 868241C8B85AF79E2DAC79EDADB723E82A36AFC3 -s Disallowed
-::  Certificate Authority of WoSign(USERTrust)
+::  Certificate Authority of WoSign(USERTrust) [v998]
 %CertMgr% -del -c -sha1 56FAADDC596DCF78D585D83A35BC04B690D12736 -s Disallowed
 ::  WoSign Premium Server Authority(USERTrust)
 %CertMgr% -del -c -sha1 E3D569137E603E7BACB6BCC66AE943850C8ADF38 -s Disallowed
@@ -107,6 +107,30 @@ if "%PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432%" == "x86" set CertMgr=%Cert
 %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 Certificate Authority
+%CertMgr% -del -c -sha1 67650DF17E8E7E5B8240A4F4564BCFE23D69C6F0 -s Disallowed
+::  Government Root Certificate Authority
+%CertMgr% -del -c -sha1 F48B11BFDEABBE94542071E641DE6BBE882B40B9 -s Disallowed
+::  TWCA Global Root CA
+%CertMgr% -del -c -sha1 9CBB4853F6A4F6D352A4E83252556013F5ADAF65 -s Disallowed
+::  TWCA Root Certificate Authority(1)
+%CertMgr% -del -c -sha1 CF9E876DD3EBFC422697A3B5A37AA076A9062348 -s Disallowed
+::  TWCA Root Certificate 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 Certificate Authority
+%CertMgr% -del -c -sha1 339D811FEC673E7F731307A34C7C7523ABBE7DFE -s Disallowed
 
 :Exit
 :: Print to screen.
-- 
GitLab