From be62db7783fbf4acb8589a482968c445f06f739f Mon Sep 17 00:00:00 2001
From: chengr28 <chengr28@gmail.com>
Date: Fri, 3 Oct 2014 14:43:25 +0800
Subject: [PATCH] 2014-10-03

---
 Mac/AntiChinaCerts.sh                         |   2 +-
 ...st-settings.plist => Trust_Settings.plist} |   0
 README.md                                     |  84 ++++----
 Windows/AntiChinaCerts_All.bat                | 192 ++++++++++++++++++
 Windows/AntiChinaCerts_Base.bat               |  12 +-
 Windows/AntiChinaCerts_Extended.bat           |  32 ++-
 ...ification_Authority_Of_WoSign(Chinese).crt |   0
 Windows/Certs/China_Trust_Network_1.crt       |  25 +++
 Windows/Certs/China_Trust_Network_2.crt       |  25 +++
 Windows/Certs/China_Trust_Network_3.crt       |  25 +++
 Windows/Certs/FakeYahooCom_201409.crt         |  15 ++
 11 files changed, 363 insertions(+), 49 deletions(-)
 rename Mac/{trust-settings.plist => Trust_Settings.plist} (100%)
 create mode 100644 Windows/AntiChinaCerts_All.bat
 rename "Windows/Certs/CA_\346\262\203\351\200\232\346\240\271\350\257\201\344\271\246.crt" => Windows/Certs/Certification_Authority_Of_WoSign(Chinese).crt (100%)
 create mode 100644 Windows/Certs/China_Trust_Network_1.crt
 create mode 100644 Windows/Certs/China_Trust_Network_2.crt
 create mode 100644 Windows/Certs/China_Trust_Network_3.crt
 create mode 100644 Windows/Certs/FakeYahooCom_201409.crt

diff --git a/Mac/AntiChinaCerts.sh b/Mac/AntiChinaCerts.sh
index a9ddb01..d527c66 100755
--- a/Mac/AntiChinaCerts.sh
+++ b/Mac/AntiChinaCerts.sh
@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-security trust-settings-import -d trust-settings.plist
+security trust-settings-import -d Trust_Settings.plist
diff --git a/Mac/trust-settings.plist b/Mac/Trust_Settings.plist
similarity index 100%
rename from Mac/trust-settings.plist
rename to Mac/Trust_Settings.plist
diff --git a/README.md b/README.md
index 19e46a4..f7a5970 100644
--- a/README.md
+++ b/README.md
@@ -3,42 +3,44 @@
 Anti China Certifications.
 
 ### 更新日期
-**2014-09-21**
+**2014-10-03**
 
 ### 方法
 * Windows
-    * 直接选择运行在 Windows 目录里的批处理
-    * Base 版本直接运行 AntiChinaCerts_Base.bat 而 Extended 版本直接运行 AntiChinaCerts_Extended.bat - Extended 版本扩展了 Base 版本，具体扩展的列表参见涉及的CA根证书的介绍
-	* 操作完毕建议清空所有浏览器数据和系统缓存，并重启网络连接
+    * 直接选择运行在 Windows 目录里的批处理，建议 **使用 Extended 版本**
+    * Base 版本直接运行 AntiChinaCerts_Base.bat 而 Extended 版本直接运行 AntiChinaCerts_Extended.bat 也即 Extended 版本扩展了 Base 版本，而 AntiChinaCerts_All.bat 也即 All 版本则包含了所有列表中的证书。具体的根证书列表参见涉及的CA根证书的介绍
+    * 操作完毕建议清空所有浏览器数据和系统缓存，并重启网络连接
 * Linux
     * 以 Debian 系列为例子，其它 Linux 发行版操作方法参见其官方说明
-	* 打开终端并执行 `sudo dpkg-reconfigure ca-certificates`
-	* 在列表中找到并选择需要禁用的证书，按空格键取消对该证书的信任
-	* 对所有需要禁用的证书执行完上步操作后回车确定
-	* 操作完毕建议清空所有浏览器数据和系统缓存，并重启网络连接
+    * 打开终端并执行 `sudo dpkg-reconfigure ca-certificates`
+    * 在列表中找到并选择需要禁用的证书，按空格键取消对该证书的信任
+    * 对所有需要禁用的证书执行完上步操作后回车确定
+    * 操作完毕建议清空所有浏览器数据和系统缓存，并重启网络连接
 * Mac
-    * `实用工具` - `钥匙串访问` - 在 `钥匙串` 中选择 `系统根证书`
-	* 点击进入需要禁用的证书，展开 `信任` 标签并在 `使用此证书时` 下拉菜单选择 `永不信任` 并关闭即可
-	* 操作完毕建议清空所有浏览器数据和系统缓存，并重启网络连接
+    * 使用自动脚本
+        * 直接选择运行在 Mac 目录里的运行 `AntiChinaCerts.sh` 即可
+    * 手动操作
+        * `实用工具` - `钥匙串访问` - 在 `钥匙串` 中选择 `系统根证书`
+        * 点击进入需要禁用的证书，展开 `信任` 标签并在 `使用此证书时` 下拉菜单选择 `永不信任` 并关闭即可
+        * 操作完毕建议清空所有浏览器数据和系统缓存，并重启网络连接
 * Firefox
     * `工具` - `选项` - `高级` - `证书` - `查看证书`
-	* 点击进入需要禁用的证书，直接点击 `删除或不信任` 按钮即可
-	* 操作完毕建议清空所有浏览器数据和系统缓存，并重启网络连接
+    * 点击进入需要禁用的证书，直接点击 `删除或不信任` 按钮即可
+    * 操作完毕建议清空所有浏览器数据和系统缓存，并重启网络连接
 * Android
     * `设置` - `安全` - `受信任的凭据(显示受信任的CA证书)`
-	* 点击进入需要禁用的证书并下拉到最下面，点击 `禁用` 按钮即可
-	* 操作完毕建议清空所有浏览器数据和系统缓存，并重启网络连接
+    * 点击进入需要禁用的证书并下拉到最下面，点击 `禁用` 按钮即可
+    * 操作完毕建议清空所有浏览器数据和系统缓存，并重启网络连接
 * iOS
     * 安装 Apple 官方的 iPhone Configuration Utility/iPCU 软件，并在当前系统上导入证书并安装 iPhone 配置实用工具
-	* 左侧面板点击 `配置描述文件` - `新建` 在 `通用` 里设置好名称和标识符创建描述文件 - 在 `凭证` 里点击 `配置` - 选择证书并设置为禁用
+    * 左侧面板点击 `配置描述文件` - `新建` 在 `通用` 里设置好名称和标识符创建描述文件 - 在 `凭证` 里点击 `配置` - 选择证书并设置为禁用
     * 将设备连接到电脑 - 左侧面板点击 `设备` 下的对应设备 - 选择 `配置描述文件` 标签页 - 安装刚才新建的描述文件以安装描述文件到设备
-	* 操作完毕建议清空所有浏览器数据和系统缓存，并重启网络连接
+    * 操作完毕建议清空所有浏览器数据和系统缓存，并重启网络连接
 
 ### 说明
 * Windows
     * 本工具作用是先将列表中的CA根证书删掉，然后再将这些证书添加到CRL证书吊销列表中，CRL证书吊销列表中的证书才会被彻底禁用
-    * Extended 版本为 Base 版本扩展，添加另外几个CA根证书
-	* 大部分 Windows 的程序和浏览器 Chrome 以及 Opera 亦使用 Windows 系统
+    * 大部分 Windows 的程序和浏览器 Chrome 以及 Opera 亦使用 Windows 系统
 * Linux
     * 不同发行版系统本身的CA根证书列表可能有所不同，具体需要按实际情况操作
 * Mac
@@ -47,18 +49,17 @@ Anti China Certifications.
     * 32 版本自带有 CNNIC ROOT 以及 China Internet Network Information Center EV Certificates Root
 * Android
     * 4.4.4 版本自带有 CNNIC ROOT 以及 China Internet Network Information Center EV Certificates Root
-	* 4.4.4 版本之前的版本可能自带有 CNNIC ROOT
+    * 4.4.4 版本之前的版本可能自带有 CNNIC ROOT
 
 ### 注意
 * Windows
     * **将CA根证书直接删除没有任何作用，下次访问使用该证书的网站时系统又会重新自动联网添加。同时由于每个用户使用独立的证书列表，所以需要所有用户都运行一次本工具才能彻底禁用！**
     * 运行时如果遇到 `Error: Can not find a certificate matching the hash value` 不需要在意，只要后面吊销证书时 `CertMgr Succeeded` 运行成功就行
-	* 如果证书验证出现问题，可使用 Microsoft_Fixit_20135.diagcab(Win7以及之后) 或者 Microsoft_Fixit_51014.msi(Vista以及之前) 重置证书列表并重新安装证书更新，**不过大多数情况下并不需要**
 * Linux
     * 在 /usr/share/ca-certificates 里也有一份各程序自己的CA根证书列表，大多数情况下直接删除可能并不能禁用证书
     * Linux 发行版系统虽然提供了CA根证书调用的统一接口，但程序实际使用的CA根证书列表可能是程序本身另外保存的一份，所以实际程序使用的CA根证书列表可能与系统统一接口不相同，**强烈建议在系统统一接口禁用证书后再通过程序本身提供的证书管理器进行禁用**
 * Firefox
-	* 在 Firefox 里对自带根证书执行 `删除或不信任` 操作就相当于是禁用其所有目的，并不会将根证书本身删除
+    * 在 Firefox 里对自带根证书执行 `删除或不信任` 操作就相当于是禁用其所有目的，并不会将根证书本身删除
 * Android
     * Android 上由于没有提供比较方便的方法编辑CRL列表，故证书并不能被完全禁用，Apps 可以通过忽略证书错误继续使用
     * **Android 系统没有自带的CA根证书默认为不信任状态，不需要手动添加到系统中**
@@ -66,11 +67,11 @@ Anti China Certifications.
 ### 涉及的CA根证书
 * Base 版本
     * Fake GitHub.Com(2013-01-25)
-	    * SHA-1 指纹 ‎27A29C3A8B3261770E8B59448557DC9E9339E68C
-		* 此伪造证书被用于 2013-01-25 大规模中间人攻击 GitHub 网站
-	* Fake Google.Com(2014-07-24)
-	    * SHA-1 指纹 ‎F6BEADB9BC02E0A152D71C318739CDECFC1C085D
-		* 此伪造证书被用于 2014-09-01 大规模中间人攻击 Google 网站
+        * SHA-1 指纹 ‎27A29C3A8B3261770E8B59448557DC9E9339E68C
+        * 此伪造证书被用于 2013-01-25 大规模中间人攻击 GitHub 网站
+    * Fake Google.Com(2014-07-24)
+        * SHA-1 指纹 ‎F6BEADB9BC02E0A152D71C318739CDECFC1C085D
+        * 此伪造证书被用于 2014-09-01 大规模中间人攻击 Google 网站
     * CNNIC ROOT
         * SHA-1 指纹 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F
         * 所属机构为 [China Internet Network Information Center/CNNIC/中国互联网络信息中心](http://www.cnnic.net.cn)
@@ -79,11 +80,7 @@ Anti China Certifications.
         * SHA-1 指纹 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E
         * 所属机构为 [China Internet Network Information Center/CNNIC/中国互联网络信息中心](http://www.cnnic.net.cn)
         * [测试网址](https://evdemo.cnnic.cn)
-* Extended 版本扩展
-    * ROOTCA
-        * SHA-1 指纹 ‎DBB84423C928ABE889D0E368FC3191D151DDB1AB
-        * 所属机构为 [Office of the State Commercial Cryptography Administration/OSCCA/国家商用密码管理办公室](http://www.oscca.gov.cn)
-        * 测试：打开 Certs 目录中 CFCA_CS_SM2_OCA11 证书，该证书由 ROOTCA 交叉签署认证
+* Extended 版本
     * CFCA GT CA
         * SHA-1 指纹 EABDA240440ABBD694930A01D09764C6C2D77966
         * 所属机构为 [China Financial Certification Authority/CFCA/中国金融认证中心](http://www.cfca.com.cn)
@@ -99,17 +96,21 @@ Anti China Certifications.
     * UCA Root
         * SHA-1 指纹 8250BED5A214433A66377CBC10EF83F669DA3A67
         * 所属机构为 [Shanghai Electronic Certificate Authority Center/SHECA/上海市数字证书认证中心](http://www.sheca.com)
-		* [测试网址](https://ibanks.bankofshanghai.com)
+        * [测试网址](https://ibanks.bankofshanghai.com)
     * UCA EV Root
         * SHA-1 指纹 B9C9F58B3BBEF575E2B58328770E7B0076C40B5E
         * 所属机构为 [Shanghai Electronic Certificate Authority Center/SHECA/上海市数字证书认证中心](http://www.sheca.com)
-* 观察中（**未被禁用**）
+* All 版本
+    * ROOTCA
+        * SHA-1 指纹 ‎DBB84423C928ABE889D0E368FC3191D151DDB1AB
+        * 所属机构为 [Office of the State Commercial Cryptography Administration/OSCCA/国家商用密码管理办公室](http://www.oscca.gov.cn)
+        * 测试：打开 Certs 目录中 CFCA_CS_SM2_OCA11 证书，该证书由 ROOTCA 交叉签署认证
     * SRCA
-		* SHA-1 指纹 ‎AE3F2E66D48FC6BD1DF131E89D768D505DF14302
-		* 本证书由其自行颁发，没有经过任何符合国际标准的国际事务所进行审计，形迹可疑
+        * SHA-1 指纹 ‎AE3F2E66D48FC6BD1DF131E89D768D505DF14302
         * 所属机构为 [Sinorail Certification Authority/SRCA/中铁数字证书认证中心](http://www.12306.cn)
         * [测试网址](https://kyfw.12306.cn)
     * Certification Authority of WoSign
+        * SHA-1 指纹 B94294BF91EA8FB64BE61097C7FB001359B676CB
         * 没有安装最新CA根证书列表时则由 StartCom Certification Authority 或 UTN - DATACorp SGC 交叉签署认证
         * 所属机构为 [沃通CA](http://www.wosign.com)
         * [测试网址](https://www.wosign.com)
@@ -117,6 +118,15 @@ Anti China Certifications.
         * SHA-1 指纹 1632478D89F9213A92008563F5A4A7D312408AD6
         * 所属机构为 [沃通CA](http://www.wosign.com)
     * Class 1 Primary CA/WoSign 1999
-        * 沃通CA收购美国 WoSign 的旧证书，于1999年发布
         * SHA-1 指纹 ‎6A174570A916FBE84453EED3D070A1D8DA442829
+        * 沃通CA收购美国 WoSign 的旧证书，于1999年发布
         * 所属机构为 [沃通CA](http://www.wosign.com)
+    * China Trust Network(1)
+        * SHA-1 指纹 C2CAEB0DC296FD50596BCA0F53C5364521167039
+        * 所属机构为 [iTrusChina/天威诚信数字认证中心](http://www.itrus.com.cn)
+    * China Trust Network(2)
+        * SHA-1 指纹 B39B0B24B156D8B6123CAF7BA249DC81F27E39FA
+        * 所属机构为 [iTrusChina/天威诚信数字认证中心](http://www.itrus.com.cn)
+    * China Trust Network(3)
+        * SHA-1 指纹 7C88AE178AE6AB8E69C30AF586D84EF29B6E6AE3
+        * 所属机构为 [iTrusChina/天威诚信数字认证中心](http://www.itrus.com.cn)
diff --git a/Windows/AntiChinaCerts_All.bat b/Windows/AntiChinaCerts_All.bat
new file mode 100644
index 0000000..a4421ee
--- /dev/null
+++ b/Windows/AntiChinaCerts_All.bat
@@ -0,0 +1,192 @@
+:: AntiChinaCerts All batch
+:: Anti China Certifications.
+:: 
+:: Author: Chengr28
+:: 
+
+@echo off
+
+cd /d %~dp0
+:: Update certifications
+RootSUPD_201403_x86
+
+::cls
+cd /d %~dp0\Certs
+
+:: Architecture check
+if "%PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432%" == "x86" (goto X86) else goto X64
+
+:X86
+:: Delete certifications(Base)
+::  Fake GitHub.Com(2013-01-25)
+CertMgr_x86 -del -c -sha1 27A29C3A8B3261770E8B59448557DC9E9339E68C -s -r localMachine Root
+CertMgr_x86 -del -c -sha1 27A29C3A8B3261770E8B59448557DC9E9339E68C -s -r localMachine AuthRoot
+::  Fake Google.Com(2014-07-24)
+CertMgr_x86 -del -c -sha1 F6BEADB9BC02E0A152D71C318739CDECFC1C085D -s -r localMachine Root
+CertMgr_x86 -del -c -sha1 F6BEADB9BC02E0A152D71C318739CDECFC1C085D -s -r localMachine AuthRoot
+::  Fake Yahoo.Com(2014-09-30)
+CertMgr_x86 -del -c -sha1 2290C311EA0F3F57E06DF45B698E18E828E59BC3 -s -r localMachine Root
+CertMgr_x86 -del -c -sha1 2290C311EA0F3F57E06DF45B698E18E828E59BC3 -s -r localMachine AuthRoot
+::  CNNIC ROOT
+CertMgr_x86 -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s -r localMachine Root
+CertMgr_x86 -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s -r localMachine AuthRoot
+::  China Internet Network Information Center EV Certificates Root
+CertMgr_x86 -del -c -sha1 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E -s -r localMachine Root
+CertMgr_x86 -del -c -sha1 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E -s -r localMachine AuthRoot
+:: Delete certifications(Extended)
+::  CFCA GT CA
+CertMgr_x86 -del -c -sha1 EABDA240440ABBD694930A01D09764C6C2D77966 -s -r localMachine Root
+CertMgr_x86 -del -c -sha1 EABDA240440ABBD694930A01D09764C6C2D77966 -s -r localMachine AuthRoot
+::  CFCA EV ROOT
+CertMgr_x86 -del -c -sha1 E2B8294B5584AB6B58C290466CAC3FB8398F8483 -s -r localMachine Root
+CertMgr_x86 -del -c -sha1 E2B8294B5584AB6B58C290466CAC3FB8398F8483 -s -r localMachine AuthRoot
+::  UCA Global Root
+CertMgr_x86 -del -c -sha1 0B972C9EA6E7CC58D93B20BF71EC412E7209FABF -s -r localMachine Root
+CertMgr_x86 -del -c -sha1 0B972C9EA6E7CC58D93B20BF71EC412E7209FABF -s -r localMachine AuthRoot
+::  UCA Root
+CertMgr_x86 -del -c -sha1 8250BED5A214433A66377CBC10EF83F669DA3A67 -s -r localMachine Root
+CertMgr_x86 -del -c -sha1 8250BED5A214433A66377CBC10EF83F669DA3A67 -s -r localMachine AuthRoot
+::  UCA EV Root
+CertMgr_x86 -del -c -sha1 B9C9F58B3BBEF575E2B58328770E7B0076C40B5E -s -r localMachine Root
+CertMgr_x86 -del -c -sha1 B9C9F58B3BBEF575E2B58328770E7B0076C40B5E -s -r localMachine AuthRoot
+:: Delete certifications(All)
+::  ROOTCA
+CertMgr_x86 -del -c -sha1 DBB84423C928ABE889D0E368FC3191D151DDB1AB -s -r localMachine Root
+CertMgr_x86 -del -c -sha1 DBB84423C928ABE889D0E368FC3191D151DDB1AB -s -r localMachine AuthRoot
+::  SRCA
+CertMgr_x86 -del -c -sha1 AE3F2E66D48FC6BD1DF131E89D768D505DF14302 -s -r localMachine Root
+CertMgr_x86 -del -c -sha1 AE3F2E66D48FC6BD1DF131E89D768D505DF14302 -s -r localMachine AuthRoot
+::  Certification_Authority_Of_WoSign
+CertMgr_x86 -del -c -sha1 B94294BF91EA8FB64BE61097C7FB001359B676CB -s -r localMachine Root
+CertMgr_x86 -del -c -sha1 B94294BF91EA8FB64BE61097C7FB001359B676CB -s -r localMachine AuthRoot
+::  Certification_Authority_Of_WoSign(Chinese)
+CertMgr_x86 -del -c -sha1 1632478D89F9213A92008563F5A4A7D312408AD6 -s -r localMachine Root
+CertMgr_x86 -del -c -sha1 1632478D89F9213A92008563F5A4A7D312408AD6 -s -r localMachine AuthRoot
+::  Class_1_Primary_CA
+CertMgr_x86 -del -c -sha1 6A174570A916FBE84453EED3D070A1D8DA442829 -s -r localMachine Root
+CertMgr_x86 -del -c -sha1 6A174570A916FBE84453EED3D070A1D8DA442829 -s -r localMachine AuthRoot
+::  China_Trust_Network_1
+CertMgr_x86 -del -c -sha1 C2CAEB0DC296FD50596BCA0F53C5364521167039 -s -r localMachine Root
+CertMgr_x86 -del -c -sha1 C2CAEB0DC296FD50596BCA0F53C5364521167039 -s -r localMachine AuthRoot
+::  China_Trust_Network_2
+CertMgr_x86 -del -c -sha1 B39B0B24B156D8B6123CAF7BA249DC81F27E39FA -s -r localMachine Root
+CertMgr_x86 -del -c -sha1 B39B0B24B156D8B6123CAF7BA249DC81F27E39FA -s -r localMachine AuthRoot
+::  China_Trust_Network_3
+CertMgr_x86 -del -c -sha1 7C88AE178AE6AB8E69C30AF586D84EF29B6E6AE3 -s -r localMachine Root
+CertMgr_x86 -del -c -sha1 7C88AE178AE6AB8E69C30AF586D84EF29B6E6AE3 -s -r localMachine AuthRoot
+
+@echo.
+
+:: Add certifications to CRL(Base)
+CertMgr_x86 -add -c FakeGitHubCom_201301.crt -s Disallowed
+CertMgr_x86 -add -c FakeGoogleCom_201407.crt -s Disallowed
+CertMgr_x86 -add -c FakeYahooCom_201409.crt -s Disallowed
+CertMgr_x86 -add -c CNNIC_ROOT.crt -s Disallowed
+CertMgr_x86 -add -c China_Internet_Network_Information_Center_EV_Certificates_Root.crt -s Disallowed
+:: Add certifications to CRL(Extended)
+CertMgr_x86 -add -c CFCA_GT_CA.crt -s Disallowed
+CertMgr_x86 -add -c CFCA_EV_ROOT.crt -s Disallowed
+CertMgr_x86 -add -c UCA_Global_Root.crt -s Disallowed
+CertMgr_x86 -add -c UCA_Root.crt -s Disallowed
+CertMgr_x86 -add -c UCA_EV_Root.crt -s Disallowed
+:: Add certifications to CRL(All)
+CertMgr_x86 -add -c ROOTCA.crt -s Disallowed
+CertMgr_x86 -add -c SRCA.crt -s Disallowed
+CertMgr_x86 -add -c Certification_Authority_Of_WoSign.crt -s Disallowed
+CertMgr_x86 -add -c Certification_Authority_Of_WoSign(Chinese).crt -s Disallowed
+CertMgr_x86 -add -c Class_1_Primary_CA -s Disallowed
+CertMgr_x86 -add -c China_Trust_Network_1.crt
+CertMgr_x86 -add -c China_Trust_Network_2.crt
+CertMgr_x86 -add -c China_Trust_Network_3.crt
+
+goto Exit
+
+:X64
+:: Delete certifications(Base)
+::  Fake GitHub.Com(2013-01-25)
+CertMgr -del -c -sha1 27A29C3A8B3261770E8B59448557DC9E9339E68C -s -r localMachine Root
+CertMgr -del -c -sha1 27A29C3A8B3261770E8B59448557DC9E9339E68C -s -r localMachine 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
+::  Fake Yahoo.Com(2014-09-30)
+CertMgr -del -c -sha1 2290C311EA0F3F57E06DF45B698E18E828E59BC3 -s -r localMachine Root
+CertMgr -del -c -sha1 2290C311EA0F3F57E06DF45B698E18E828E59BC3 -s -r localMachine AuthRoot
+::  CNNIC ROOT
+CertMgr -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s -r localMachine Root
+CertMgr -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s -r localMachine 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
+:: Delete certifications(Extended)
+::  CFCA GT CA
+CertMgr -del -c -sha1 EABDA240440ABBD694930A01D09764C6C2D77966 -s -r localMachine Root
+CertMgr -del -c -sha1 EABDA240440ABBD694930A01D09764C6C2D77966 -s -r localMachine AuthRoot
+::  CFCA EV ROOT
+CertMgr -del -c -sha1 E2B8294B5584AB6B58C290466CAC3FB8398F8483 -s -r localMachine Root
+CertMgr -del -c -sha1 E2B8294B5584AB6B58C290466CAC3FB8398F8483 -s -r localMachine AuthRoot
+::  UCA Global Root
+CertMgr -del -c -sha1 0B972C9EA6E7CC58D93B20BF71EC412E7209FABF -s -r localMachine Root
+CertMgr -del -c -sha1 0B972C9EA6E7CC58D93B20BF71EC412E7209FABF -s -r localMachine AuthRoot
+::  UCA Root
+CertMgr -del -c -sha1 8250BED5A214433A66377CBC10EF83F669DA3A67 -s -r localMachine Root
+CertMgr -del -c -sha1 8250BED5A214433A66377CBC10EF83F669DA3A67 -s -r localMachine AuthRoot
+::  UCA EV Root
+CertMgr -del -c -sha1 B9C9F58B3BBEF575E2B58328770E7B0076C40B5E -s -r localMachine Root
+CertMgr -del -c -sha1 B9C9F58B3BBEF575E2B58328770E7B0076C40B5E -s -r localMachine AuthRoot
+:: Delete certifications(All)
+::  ROOTCA
+CertMgr -del -c -sha1 DBB84423C928ABE889D0E368FC3191D151DDB1AB -s -r localMachine Root
+CertMgr -del -c -sha1 DBB84423C928ABE889D0E368FC3191D151DDB1AB -s -r localMachine AuthRoot
+::  SRCA
+CertMgr -del -c -sha1 AE3F2E66D48FC6BD1DF131E89D768D505DF14302 -s -r localMachine Root
+CertMgr -del -c -sha1 AE3F2E66D48FC6BD1DF131E89D768D505DF14302 -s -r localMachine AuthRoot
+::  Certification_Authority_Of_WoSign
+CertMgr -del -c -sha1 B94294BF91EA8FB64BE61097C7FB001359B676CB -s -r localMachine Root
+CertMgr -del -c -sha1 B94294BF91EA8FB64BE61097C7FB001359B676CB -s -r localMachine AuthRoot
+::  Certification_Authority_Of_WoSign(Chinese)
+CertMgr -del -c -sha1 1632478D89F9213A92008563F5A4A7D312408AD6 -s -r localMachine Root
+CertMgr -del -c -sha1 1632478D89F9213A92008563F5A4A7D312408AD6 -s -r localMachine AuthRoot
+::  Class_1_Primary_CA
+CertMgr -del -c -sha1 6A174570A916FBE84453EED3D070A1D8DA442829 -s -r localMachine Root
+CertMgr -del -c -sha1 6A174570A916FBE84453EED3D070A1D8DA442829 -s -r localMachine AuthRoot
+::  China_Trust_Network_1
+CertMgr -del -c -sha1 C2CAEB0DC296FD50596BCA0F53C5364521167039 -s -r localMachine Root
+CertMgr -del -c -sha1 C2CAEB0DC296FD50596BCA0F53C5364521167039 -s -r localMachine AuthRoot
+::  China_Trust_Network_2
+CertMgr -del -c -sha1 B39B0B24B156D8B6123CAF7BA249DC81F27E39FA -s -r localMachine Root
+CertMgr -del -c -sha1 B39B0B24B156D8B6123CAF7BA249DC81F27E39FA -s -r localMachine AuthRoot
+::  China_Trust_Network_3
+CertMgr -del -c -sha1 7C88AE178AE6AB8E69C30AF586D84EF29B6E6AE3 -s -r localMachine Root
+CertMgr -del -c -sha1 7C88AE178AE6AB8E69C30AF586D84EF29B6E6AE3 -s -r localMachine AuthRoot
+
+@echo.
+
+:: Add certifications to CRL(Base)
+CertMgr -add -c FakeGitHubCom_201301.crt -s Disallowed
+CertMgr -add -c FakeGoogleCom_201407.crt -s Disallowed
+CertMgr -add -c FakeYahooCom_201409.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
+:: Add certifications to CRL(Extended)
+CertMgr -add -c CFCA_GT_CA.crt -s Disallowed
+CertMgr -add -c CFCA_EV_ROOT.crt -s Disallowed
+CertMgr -add -c UCA_Global_Root.crt -s Disallowed
+CertMgr -add -c UCA_Root.crt -s Disallowed
+CertMgr -add -c UCA_EV_Root.crt -s Disallowed
+:: Add certifications to CRL(All)
+CertMgr -add -c ROOTCA.crt -s Disallowed
+CertMgr -add -c SRCA.crt -s Disallowed
+CertMgr -add -c Certification_Authority_Of_WoSign.crt -s Disallowed
+CertMgr -add -c Certification_Authority_Of_WoSign(Chinese).crt -s Disallowed
+CertMgr -add -c Class_1_Primary_CA -s Disallowed
+CertMgr -add -c China_Trust_Network_1.crt
+CertMgr -add -c China_Trust_Network_2.crt
+CertMgr -add -c China_Trust_Network_3.crt
+
+:Exit
+:: Print to screen.
+@echo.
+@echo Done. Please confirm the messages on screen.
+@echo.
+@pause
diff --git a/Windows/AntiChinaCerts_Base.bat b/Windows/AntiChinaCerts_Base.bat
index bbd7c13..3bc8f97 100644
--- a/Windows/AntiChinaCerts_Base.bat
+++ b/Windows/AntiChinaCerts_Base.bat
@@ -35,6 +35,9 @@ CertMgr_x86 -del -c -sha1 27A29C3A8B3261770E8B59448557DC9E9339E68C -s -r localMa
 ::  Fake Google.Com(2014-07-24)
 CertMgr_x86 -del -c -sha1 F6BEADB9BC02E0A152D71C318739CDECFC1C085D -s -r localMachine Root
 CertMgr_x86 -del -c -sha1 F6BEADB9BC02E0A152D71C318739CDECFC1C085D -s -r localMachine AuthRoot
+::  Fake Yahoo.Com(2014-09-30)
+CertMgr_x86 -del -c -sha1 2290C311EA0F3F57E06DF45B698E18E828E59BC3 -s -r localMachine Root
+CertMgr_x86 -del -c -sha1 2290C311EA0F3F57E06DF45B698E18E828E59BC3 -s -r localMachine AuthRoot
 ::  CNNIC ROOT
 CertMgr_x86 -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s -r localMachine Root
 CertMgr_x86 -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s -r localMachine AuthRoot
@@ -47,6 +50,7 @@ CertMgr_x86 -del -c -sha1 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E -s -r localMa
 :: Add certifications to CRL(Base)
 CertMgr_x86 -add -c FakeGitHubCom_201301.crt -s Disallowed
 CertMgr_x86 -add -c FakeGoogleCom_201407.crt -s Disallowed
+CertMgr_x86 -add -c FakeYahooCom_201409.crt -s Disallowed
 CertMgr_x86 -add -c CNNIC_ROOT.crt -s Disallowed
 CertMgr_x86 -add -c China_Internet_Network_Information_Center_EV_Certificates_Root.crt -s Disallowed
 goto Exit
@@ -59,6 +63,9 @@ CertMgr -del -c -sha1 27A29C3A8B3261770E8B59448557DC9E9339E68C -s -r localMachin
 ::  Fake Google.Com(2014-07-24)
 CertMgr -del -c -sha1 F6BEADB9BC02E0A152D71C318739CDECFC1C085D -s -r localMachine Root
 CertMgr -del -c -sha1 F6BEADB9BC02E0A152D71C318739CDECFC1C085D -s -r localMachine 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
 ::  CNNIC ROOT
 CertMgr -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s -r localMachine Root
 CertMgr -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s -r localMachine AuthRoot
@@ -69,8 +76,9 @@ CertMgr -del -c -sha1 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E -s -r localMachin
 @echo.
 
 :: Add certifications to CRL(Base)
-CertMgr -add -c FakeGitHubCom_2013_01.crt -s Disallowed
-CertMgr -add -c FakeGoogleCom_2014_07.crt -s Disallowed
+CertMgr -add -c FakeGitHubCom_201301.crt -s Disallowed
+CertMgr -add -c FakeGoogleCom_201407.crt -s Disallowed
+CertMgr -add -c FakeYahooCom_201409.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
 
diff --git a/Windows/AntiChinaCerts_Extended.bat b/Windows/AntiChinaCerts_Extended.bat
index 909e7df..15a0827 100644
--- a/Windows/AntiChinaCerts_Extended.bat
+++ b/Windows/AntiChinaCerts_Extended.bat
@@ -21,7 +21,7 @@ cd /d %~dp0
 :: Update certifications
 RootSUPD_201403_x86
 
-cls
+::cls
 cd /d %~dp0\Certs
 
 :: Architecture check
@@ -35,6 +35,9 @@ CertMgr_x86 -del -c -sha1 27A29C3A8B3261770E8B59448557DC9E9339E68C -s -r localMa
 ::  Fake Google.Com(2014-07-24)
 CertMgr_x86 -del -c -sha1 F6BEADB9BC02E0A152D71C318739CDECFC1C085D -s -r localMachine Root
 CertMgr_x86 -del -c -sha1 F6BEADB9BC02E0A152D71C318739CDECFC1C085D -s -r localMachine AuthRoot
+::  Fake Yahoo.Com(2014-09-30)
+CertMgr_x86 -del -c -sha1 2290C311EA0F3F57E06DF45B698E18E828E59BC3 -s -r localMachine Root
+CertMgr_x86 -del -c -sha1 2290C311EA0F3F57E06DF45B698E18E828E59BC3 -s -r localMachine AuthRoot
 ::  CNNIC ROOT
 CertMgr_x86 -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s -r localMachine Root
 CertMgr_x86 -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s -r localMachine AuthRoot
@@ -42,9 +45,11 @@ CertMgr_x86 -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s -r localMa
 CertMgr_x86 -del -c -sha1 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E -s -r localMachine Root
 CertMgr_x86 -del -c -sha1 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E -s -r localMachine AuthRoot
 :: Delete certifications(Extended)
+::  Move to All version.
 ::  ROOTCA
-CertMgr_x86 -del -c -sha1 DBB84423C928ABE889D0E368FC3191D151DDB1AB -s -r localMachine Root
-CertMgr_x86 -del -c -sha1 DBB84423C928ABE889D0E368FC3191D151DDB1AB -s -r localMachine AuthRoot
+CertMgr_x86 -del -c -sha1 DBB84423C928ABE889D0E368FC3191D151DDB1AB -s Disallowed
+:: CertMgr_x86 -del -c -sha1 DBB84423C928ABE889D0E368FC3191D151DDB1AB -s -r localMachine Root
+:: CertMgr_x86 -del -c -sha1 DBB84423C928ABE889D0E368FC3191D151DDB1AB -s -r localMachine AuthRoot
 ::  CFCA GT CA
 CertMgr_x86 -del -c -sha1 EABDA240440ABBD694930A01D09764C6C2D77966 -s -r localMachine Root
 CertMgr_x86 -del -c -sha1 EABDA240440ABBD694930A01D09764C6C2D77966 -s -r localMachine AuthRoot
@@ -66,10 +71,12 @@ CertMgr_x86 -del -c -sha1 B9C9F58B3BBEF575E2B58328770E7B0076C40B5E -s -r localMa
 :: Add certifications to CRL(Base)
 CertMgr_x86 -add -c FakeGitHubCom_201301.crt -s Disallowed
 CertMgr_x86 -add -c FakeGoogleCom_201407.crt -s Disallowed
+CertMgr_x86 -add -c FakeYahooCom_201409.crt -s Disallowed
 CertMgr_x86 -add -c CNNIC_ROOT.crt -s Disallowed
 CertMgr_x86 -add -c China_Internet_Network_Information_Center_EV_Certificates_Root.crt -s Disallowed
 :: Add certifications to CRL(Extended)
-CertMgr_x86 -add -c ROOTCA.crt -s Disallowed
+::  Move to All version.
+::  CertMgr_x86 -add -c ROOTCA.crt -s Disallowed
 CertMgr_x86 -add -c CFCA_GT_CA.crt -s Disallowed
 CertMgr_x86 -add -c CFCA_EV_ROOT.crt -s Disallowed
 CertMgr_x86 -add -c UCA_Global_Root.crt -s Disallowed
@@ -85,6 +92,9 @@ CertMgr -del -c -sha1 27A29C3A8B3261770E8B59448557DC9E9339E68C -s -r localMachin
 ::  Fake Google.Com(2014-07-24)
 CertMgr -del -c -sha1 F6BEADB9BC02E0A152D71C318739CDECFC1C085D -s -r localMachine Root
 CertMgr -del -c -sha1 F6BEADB9BC02E0A152D71C318739CDECFC1C085D -s -r localMachine 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
 ::  CNNIC ROOT
 CertMgr -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s -r localMachine Root
 CertMgr -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s -r localMachine AuthRoot
@@ -92,9 +102,11 @@ CertMgr -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s -r localMachin
 CertMgr -del -c -sha1 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E -s -r localMachine Root
 CertMgr -del -c -sha1 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E -s -r localMachine AuthRoot
 :: Delete certifications(Extended)
+::  Move to All version.
 ::  ROOTCA
-CertMgr -del -c -sha1 DBB84423C928ABE889D0E368FC3191D151DDB1AB -s -r localMachine Root
-CertMgr -del -c -sha1 DBB84423C928ABE889D0E368FC3191D151DDB1AB -s -r localMachine AuthRoot
+CertMgr -del -c -sha1 DBB84423C928ABE889D0E368FC3191D151DDB1AB -s Disallowed
+:: CertMgr -del -c -sha1 DBB84423C928ABE889D0E368FC3191D151DDB1AB -s -r localMachine Root
+:: CertMgr -del -c -sha1 DBB84423C928ABE889D0E368FC3191D151DDB1AB -s -r localMachine AuthRoot
 ::  CFCA GT CA
 CertMgr -del -c -sha1 EABDA240440ABBD694930A01D09764C6C2D77966 -s -r localMachine Root
 CertMgr -del -c -sha1 EABDA240440ABBD694930A01D09764C6C2D77966 -s -r localMachine AuthRoot
@@ -114,12 +126,14 @@ CertMgr -del -c -sha1 B9C9F58B3BBEF575E2B58328770E7B0076C40B5E -s -r localMachin
 @echo.
 
 :: Add certifications to CRL(Base)
-CertMgr -add -c FakeGitHubCom_2013_01.crt -s Disallowed
-CertMgr -add -c FakeGoogleCom_2014_07.crt -s Disallowed
+CertMgr -add -c FakeGitHubCom_201301.crt -s Disallowed
+CertMgr -add -c FakeGoogleCom_201407.crt -s Disallowed
+CertMgr -add -c FakeYahooCom_201409.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
 :: Add certifications to CRL(Extended)
-CertMgr -add -c ROOTCA.crt -s Disallowed
+::  Move to All version.
+::  CertMgr -add -c ROOTCA.crt -s Disallowed
 CertMgr -add -c CFCA_GT_CA.crt -s Disallowed
 CertMgr -add -c CFCA_EV_ROOT.crt -s Disallowed
 CertMgr -add -c UCA_Global_Root.crt -s Disallowed
diff --git "a/Windows/Certs/CA_\346\262\203\351\200\232\346\240\271\350\257\201\344\271\246.crt" b/Windows/Certs/Certification_Authority_Of_WoSign(Chinese).crt
similarity index 100%
rename from "Windows/Certs/CA_\346\262\203\351\200\232\346\240\271\350\257\201\344\271\246.crt"
rename to Windows/Certs/Certification_Authority_Of_WoSign(Chinese).crt
diff --git a/Windows/Certs/China_Trust_Network_1.crt b/Windows/Certs/China_Trust_Network_1.crt
new file mode 100644
index 0000000..60a6f08
--- /dev/null
+++ b/Windows/Certs/China_Trust_Network_1.crt
@@ -0,0 +1,25 @@
+-----BEGIN CERTIFICATE-----
+MIIESjCCAzKgAwIBAgIRAPaWr4MXwBGPHjsW2JGJ58swDQYJKoZIhvcNAQEFBQAw
+gdAxCzAJBgNVBAYTAkNOMR0wGwYDVQQKExRpVHJ1c2NoaW5hIENvLiwgTHRkLjFC
+MEAGA1UECxM5aVRydXNjaGluYSBDbGFzcyAxIFB1YmxpYyBQcmltYXJ5IENlcnRp
+ZmljYXRpb24gQXV0aG9yaXR5MUAwPgYDVQQLEzcoYykgMjAwNiBpVHJ1c2NoaW5h
+IENvLiwgTHRkLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MRwwGgYDVQQLExND
+aGluYSBUcnVzdCBOZXR3b3JrMB4XDTA2MDgwODAwMDAwMFoXDTI2MDgwNzIzNTk1
+OVowgdAxCzAJBgNVBAYTAkNOMR0wGwYDVQQKExRpVHJ1c2NoaW5hIENvLiwgTHRk
+LjFCMEAGA1UECxM5aVRydXNjaGluYSBDbGFzcyAxIFB1YmxpYyBQcmltYXJ5IENl
+cnRpZmljYXRpb24gQXV0aG9yaXR5MUAwPgYDVQQLEzcoYykgMjAwNiBpVHJ1c2No
+aW5hIENvLiwgTHRkLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MRwwGgYDVQQL
+ExNDaGluYSBUcnVzdCBOZXR3b3JrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEA2wlAvY5pBrKLnZhAFL+VnKQrrutz6duadnKE+dOX6B4GOewXKJ9OrxZY
++t0UnOwpJNmTdkOr2FHowBkqFhCb1b3TFkjqfx0TVIgZoycRZLAt7SoEwC0M66g/
+SQ/dofy/mwZgrddn/BFk2eZEG/GhjzLlIuNhoe71weoWqdQVTO2l8Z3WBtWbjAMb
+8/s901KTCvAyBSCC/JePI14RjOyoXDRig+IVaXT/4Y1geyqxZ4glPE4hhTaHx8RI
+hxq41uKKe7My65JGXLOsPJhFfaXHQjTRfjdCFUEdcUn4gXCIPByDTLv1E/HFM/HY
+0C9yr3xo4c9eq9RVpeRdpA/DxXFK3QIDAQABox0wGzAMBgNVHRMEBTADAQH/MAsG
+A1UdDwQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAZUII0t5GVOZyMNDNyYsiVxu3
+2sTtXgHiIQP3puu90KSNEq0lxK4g4twTLkIJikb6K7ei8fBPZD8GbpNOwRiQyAX6
+kbQnh5S8JpGvFTNmAfHmLTxWrp2AotcHXkxkuIkZPX9Q8P65yr0WShZ7NhYEAqYW
+XlVlDALuTcc89Aehz3LhOOylSRuezU2vvzwwJIYqvhiFdKm7p61sucvZYu6WGDHl
+ZMLmmbkL3Rccg6Mgt0lXKI+tF7Vm+7Nb0hjldQvSvupbMIWYEtnbEU2uoXN/SVyR
+segVlCeOwhkNuJNbx8FTh5va8Q7X5wMQOqVIUApXx7qjHec471WY+nH31IP9xA==
+-----END CERTIFICATE-----
diff --git a/Windows/Certs/China_Trust_Network_2.crt b/Windows/Certs/China_Trust_Network_2.crt
new file mode 100644
index 0000000..cf360db
--- /dev/null
+++ b/Windows/Certs/China_Trust_Network_2.crt
@@ -0,0 +1,25 @@
+-----BEGIN CERTIFICATE-----
+MIIESTCCAzGgAwIBAgIQB/kNOH3KKItszagsoFb69TANBgkqhkiG9w0BAQUFADCB
+0DELMAkGA1UEBhMCQ04xHTAbBgNVBAoTFGlUcnVzY2hpbmEgQ28uLCBMdGQuMUIw
+QAYDVQQLEzlpVHJ1c2NoaW5hIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlm
+aWNhdGlvbiBBdXRob3JpdHkxQDA+BgNVBAsTNyhjKSAyMDA2IGlUcnVzY2hpbmEg
+Q28uLCBMdGQuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHDAaBgNVBAsTE0No
+aW5hIFRydXN0IE5ldHdvcmswHhcNMDYwODA4MDAwMDAwWhcNMjYwODA3MjM1OTU5
+WjCB0DELMAkGA1UEBhMCQ04xHTAbBgNVBAoTFGlUcnVzY2hpbmEgQ28uLCBMdGQu
+MUIwQAYDVQQLEzlpVHJ1c2NoaW5hIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2Vy
+dGlmaWNhdGlvbiBBdXRob3JpdHkxQDA+BgNVBAsTNyhjKSAyMDA2IGlUcnVzY2hp
+bmEgQ28uLCBMdGQuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHDAaBgNVBAsT
+E0NoaW5hIFRydXN0IE5ldHdvcmswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQDBiagn0ZgsNWZnHTBe3IwRPBHHLtQ7pfjCTULy6+e8qsy4GZTl2vgV32SC
+xUEzc91nptl5sFmGZDpcCdy3ogwzpFFMMl8cvGALY8zvltxKjhacYh4XIq2444IY
+xYIbIM0wiC+i1ZKKQGb+z+GrlTtBqsZjTpEMjVWuH+4SQDzFeOd6Kc2jlt5rTSoR
+QGAqCegs97vubppvKBd0EUjiNOwgU0HOvnwv0ZRUr4Zex1KpSo2aFbmRaL2inASR
+JSKvMxkM6Jbgml9+JFvxv0qgfSB6hqgxVof252YJrHM5sdjq3m92bZbQVY7v4MPd
+TOLg0MyJtrLYP0r8MEm5fAT7JvvBAgMBAAGjHTAbMAwGA1UdEwQFMAMBAf8wCwYD
+VR0PBAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQAuQMM6oRQKnunRd9ctIAF4tepi
+RB7/FPK5impvAPS+JTkBpHp/QBrO6QdWJPzhzz7MGRC85gV1oF+lJljz7M84v/D9
+YaF1FchgNFnMFaQIp3JtHGhF1M1xx4++kyKZCGLouymfdPqKEptiVwAQhD4Ay+cj
+A/b3iZgVhkvKEy5sEw/OsvRB6bNyh4nRHpk2kxSzbKZfBMfMPdRRCiLgflDu5APN
+/Aj0dJ9tTbaPD/9bggJvsPqYE4y+ooVjdebfdTtX9o43jzNJzuIGJcRsZnpZTL1Q
+h6cdQ+JgszqFR2Oq82RedMLHD6j+pLooAUaNymE+/NiVIF4MCghkTboheth3
+-----END CERTIFICATE-----
diff --git a/Windows/Certs/China_Trust_Network_3.crt b/Windows/Certs/China_Trust_Network_3.crt
new file mode 100644
index 0000000..19e513f
--- /dev/null
+++ b/Windows/Certs/China_Trust_Network_3.crt
@@ -0,0 +1,25 @@
+-----BEGIN CERTIFICATE-----
+MIIESTCCAzGgAwIBAgIQcxqnoaCdQwujKuz5LUkRQjANBgkqhkiG9w0BAQUFADCB
+0DELMAkGA1UEBhMCQ04xHTAbBgNVBAoTFGlUcnVzY2hpbmEgQ28uLCBMdGQuMUIw
+QAYDVQQLEzlpVHJ1c2NoaW5hIENsYXNzIDIgUHVibGljIFByaW1hcnkgQ2VydGlm
+aWNhdGlvbiBBdXRob3JpdHkxQDA+BgNVBAsTNyhjKSAyMDA2IGlUcnVzY2hpbmEg
+Q28uLCBMdGQuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHDAaBgNVBAsTE0No
+aW5hIFRydXN0IE5ldHdvcmswHhcNMDYwODA4MDAwMDAwWhcNMjYwODA3MjM1OTU5
+WjCB0DELMAkGA1UEBhMCQ04xHTAbBgNVBAoTFGlUcnVzY2hpbmEgQ28uLCBMdGQu
+MUIwQAYDVQQLEzlpVHJ1c2NoaW5hIENsYXNzIDIgUHVibGljIFByaW1hcnkgQ2Vy
+dGlmaWNhdGlvbiBBdXRob3JpdHkxQDA+BgNVBAsTNyhjKSAyMDA2IGlUcnVzY2hp
+bmEgQ28uLCBMdGQuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHDAaBgNVBAsT
+E0NoaW5hIFRydXN0IE5ldHdvcmswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQDQ5aIuFGCfX7OPuoG3NdeAQru6GVyLjHjjpW7gBpinkaT74mviKig8RUPA
+1KBhEB2t9s+SuFHrzfJWqJFoz5AMwFU1T6we02ET92jGhuJXDZYOmWRn7MVSZrfr
+x6hCjsyc5Dg367QkOVsopKlfLvZQ7ZCohIgnWIV/F6WwbrJvc013Tshmn/O6wRM6
+lnrn5SyZIyIsd8yg1RyYbJK4o36Y1YYoMC594TOv13rd3z+CxrKaRH7SsqWC2rfp
+6QHAEVpRPDQkLBoro8p9OCnu0VbJSnVvumYAIi5FINSbcSSlAcAesVEdgkK+5AlT
+LWVlXAh297zrE+niK2pgDnqoocwFAgMBAAGjHTAbMAwGA1UdEwQFMAMBAf8wCwYD
+VR0PBAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQBvXKYUatSNXMy/8N8+Qd8oE6dU
+e0vdzPmpd9RhbfTvXOAXmhJrNacsXbxdL2uCcYHX8HsjwoO0v6b8l+Wgiv6mWYmZ
+Vifi23sviDxvN+kUImRM6AyU7s8duLOobRKHhzoRXt1N4a3KklAThHYp1DHASlqw
+MY2GbpWrWnquBQx0wZ3bWxoMZYxacYs6VvYN2KqR/XX6+9p29ejK+FgmReCPDGtK
+25gSN+nbSQBhAzunyZ7e+0ZQHL8ZuwVcSEObX5QNdl3Slb7QNFi9jLtMMADy9skq
+AHz9x40sHiryqPlNLmQyPYQZ65iwN2dFHsIje5xqSCF2xSOb9bGqfNzcNWah
+-----END CERTIFICATE-----
diff --git a/Windows/Certs/FakeYahooCom_201409.crt b/Windows/Certs/FakeYahooCom_201409.crt
new file mode 100644
index 0000000..386916f
--- /dev/null
+++ b/Windows/Certs/FakeYahooCom_201409.crt
@@ -0,0 +1,15 @@
+-----BEGIN CERTIFICATE-----
+MIICXDCCAcWgAwIBAgIBJzANBgkqhkiG9w0BAQQFADA1MQswCQYDVQQGEwJjbjES
+MBAGA1UEChMJeWFob28uY29tMRIwEAYDVQQDEwl5YWhvby5jb20wHhcNMTQwOTIz
+MTEzMDE3WhcNMTUwOTIzMTEzMDE3WjA1MQswCQYDVQQGEwJjbjESMBAGA1UEChMJ
+eWFob28uY29tMRIwEAYDVQQDEwl5YWhvby5jb20wgZ8wDQYJKoZIhvcNAQEBBQAD
+gY0AMIGJAoGBAL3OvVN2YMqRckHPxoWcrvzz5idsPwybCIoQFnrZz1IZpSN5Utyn
+AM6jR2Yy6eNO3xDk76F99GHhuuiCdOStEyI5Yzee6bTO6hSTxEXZWuXL5Vnie6He
+IMILLewBrktW3VEMwPj5GWOVMclPTeaSnfPCy6WuKNeYZNPRRLGgIoG1AgMBAAGj
+fDB6MAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgQwMB0GA1UdDgQWBBQtefGr
+GeRCTxctj8D2vpdWc/ygJzARBglghkgBhvhCAQEEBAMCBeAwKAYJYIZIAYb4QgEN
+BBsWGWV4YW1wbGUgY29tbWVudCBleHRlbnNpb24wDQYJKoZIhvcNAQEEBQADgYEA
+Y+n1H+Io1sgIlEfWSEKZ5WLrbaV7fEu5XV1tLtZija07K99aDaXuFDAlHMJpXAzY
+RfClPwdBXA70Cv8rztHFLkah2TCmazLLRkaZ2mFKkuE9XAd3qVfFcfG14Zj0H27I
+NHAmtdi+uoTqDmgOTnRivFkDM7uB9kH4Av44Ol2p3SU=
+-----END CERTIFICATE-----
-- 
GitLab