diff --git a/Mac/RevokeChinaCerts.sh b/Mac/RevokeChinaCerts.sh index 2d63ed18c241eca318aa32b07c8588340889c3de..4f2ab97e70ced70d94b48c2d261109693351949b 100644 --- a/Mac/RevokeChinaCerts.sh +++ b/Mac/RevokeChinaCerts.sh @@ -1,4 +1,4 @@ -# RevokeChinaCerts Mac shell +# RevokeChinaCerts shell(Mac) # Revoke China Certificates. # # Author: QuantumGhost diff --git a/Mac/RevokeChinaCerts_All.sh b/Mac/RevokeChinaCerts_All.sh new file mode 100644 index 0000000000000000000000000000000000000000..38094826ba645a94a726d6fa8eb63c5198dcd9f0 --- /dev/null +++ b/Mac/RevokeChinaCerts_All.sh @@ -0,0 +1,8 @@ +# RevokeChinaCerts All shell(Mac) +# Revoke China Certificates. +# +# Author: Chengr28 +# + +#!/usr/bin/env bash +security trust-settings-import -d Trust_Settings_All.plist diff --git a/Mac/Trust_Settings_All.plist b/Mac/Trust_Settings_All.plist new file mode 100644 index 0000000000000000000000000000000000000000..4fbca15d2f6d07acafe60b83e26376d233485eae --- /dev/null +++ b/Mac/Trust_Settings_All.plist @@ -0,0 +1,873 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>trustList</key> + <dict> + <key>0B972C9EA6E7CC58D93B20BF71EC412E7209FABF</key> + <dict> + <key>issuerName</key> + <data> + MDoxCzAJBgNVBAYTAkNOMREwDwYDVQQKEwhVbmlUcnVzdDEYMBYG + A1UEAxMPVUNBIEdsb2JhbCBSb290 + </data> + <key>modDate</key> + <date>2014-03-30T08:34:18Z</date> + <key>serialNumber</key> + <data> + CA== + </data> + <key>trustSettings</key> + <array> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAED + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147408896</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAED + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEI + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147408872</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEI + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEJ + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEL + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEM + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEO + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEP + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEQ + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEU + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEC + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + </array> + </dict> + <key>4F99AA93FB2BD13726A1994ACE7FF005F2935D1E</key> + <dict> + <key>issuerName</key> + <data> + MIGKMQswCQYDVQQGEwJDTjEyMDAGA1UECgwpQ2hpbmEgSW50ZXJu + ZXQgTmV0d29yayBJbmZvcm1hdGlvbiBDZW50ZXIxRzBFBgNVBAMM + PkNoaW5hIEludGVybmV0IE5ldHdvcmsgSW5mb3JtYXRpb24gQ2Vu + dGVyIEVWIENlcnRpZmljYXRlcyBSb290 + </data> + <key>modDate</key> + <date>2014-03-30T08:24:04Z</date> + <key>serialNumber</key> + <data> + SJ8AAQ== + </data> + <key>trustSettings</key> + <array> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAED + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147408896</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAED + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEI + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147408872</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEI + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEJ + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEL + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEM + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEO + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEP + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEQ + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEU + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEC + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + </array> + </dict> + <key>67650DF17E8E7E5B8240A4F4564BCFE23D69C6F0</key> + <dict> + <key>issuerName</key> + <data> + MF4xCzAJBgNVBAYTAlRXMSMwIQYDVQQKDBpDaHVuZ2h3YSBUZWxl + Y29tIENvLiwgTHRkLjEqMCgGA1UECwwhZVBLSSBSb290IENlcnRp + ZmljYXRpb24gQXV0aG9yaXR5 + </data> + <key>modDate</key> + <date>2014-12-30T02:38:52Z</date> + <key>serialNumber</key> + <data> + Fci9ZUdcr7iXAF7kBtK8nQ== + </data> + <key>trustSettings</key> + <array> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAED + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147408896</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAED + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEI + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147408872</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEI + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEJ + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEL + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEM + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEO + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEP + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEQ + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEU + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEC + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + </array> + </dict> + <key>8250BED5A214433A66377CBC10EF83F669DA3A67</key> + <dict> + <key>issuerName</key> + <data> + MDMxCzAJBgNVBAYTAkNOMREwDwYDVQQKEwhVbmlUcnVzdDERMA8G + A1UEAxMIVUNBIFJvb3Q= + </data> + <key>modDate</key> + <date>2014-03-30T08:34:39Z</date> + <key>serialNumber</key> + <data> + CQ== + </data> + <key>trustSettings</key> + <array> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAED + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147408896</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAED + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEI + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147408872</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEI + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEJ + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEL + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEM + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEO + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEP + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEQ + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEU + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEC + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + </array> + </dict> + <key>8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F</key> + <dict> + <key>issuerName</key> + <data> + MDIxCzAJBgNVBAYTAkNOMQ4wDAYDVQQKEwVDTk5JQzETMBEGA1UE + AxMKQ05OSUMgUk9PVA== + </data> + <key>modDate</key> + <date>2014-09-29T08:25:38Z</date> + <key>serialNumber</key> + <data> + STMAAQ== + </data> + <key>trustSettings</key> + <array> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAED + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147408896</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAED + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEI + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147408872</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEI + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEJ + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEL + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEM + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEO + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEP + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEQ + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEU + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEC + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + </array> + </dict> + <key>CF9E876DD3EBFC422697A3B5A37AA076A9062348</key> + <dict> + <key>issuerName</key> + <data> + MF8xCzAJBgNVBAYTAlRXMRIwEAYDVQQKDAlUQUlXQU4tQ0ExEDAO + BgNVBAsMB1Jvb3QgQ0ExKjAoBgNVBAMMIVRXQ0EgUm9vdCBDZXJ0 + aWZpY2F0aW9uIEF1dGhvcml0eQ== + </data> + <key>modDate</key> + <date>2014-12-30T02:40:12Z</date> + <key>serialNumber</key> + <data> + AQ== + </data> + <key>trustSettings</key> + <array> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAED + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147408896</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAED + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEI + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147408872</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEI + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEJ + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEL + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEM + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEO + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEP + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEQ + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEU + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsPolicy</key> + <data> + KoZIhvdjZAEC + </data> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + <dict> + <key>kSecTrustSettingsAllowedError</key> + <integer>-2147409654</integer> + <key>kSecTrustSettingsResult</key> + <integer>3</integer> + </dict> + </array> + </dict> + </dict> + <key>trustVersion</key> + <integer>1</integer> +</dict> +</plist> diff --git a/README.md b/README.md index df09d916cd5512818a0c9dbb2700d5da7af894d9..f39767be90ee84f8399b984373e369b018969006 100644 --- a/README.md +++ b/README.md @@ -4,14 +4,37 @@ Revoke China Certificates.<br /> 全自动å¯ç–‘è¯ä¹¦åŠé”€å·¥å…·/全自動å¯ç–‘憑è‰æ’¤éŠ·å·¥å…·<br /> ### Updated -**2014-12-25** +**2014-12-30** -### 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)) +### Type +* Online Certificates/在线è¯ä¹¦/在線è‰æ›¸ + * These certificates are used in TLS connection for confirming servers. + * æœåŠ¡å™¨è®¤è¯éƒ¨åˆ†ï¼Œç”¨äºŽå±è”½ TLS åŠ å¯†è¿žæŽ¥æ—¶æ‰€ä½¿ç”¨çš„è¯ä¹¦ + * 伺æœå™¨èªè‰éƒ¨åˆ†ï¼Œç”¨æ–¼é®ç½© TLS åŠ å¯†é€£æŽ¥æ™‚æ‰€ä½¿ç”¨çš„è‰æ›¸ +* CodeSigning Certificates/代ç è¯ä¹¦/代碼è‰æ›¸ + * These certificates are used in code signing for confirming software publishers. + * 代ç ç¾å部分，用于å±è”½æŸè½¯ä»¶å‘行商å‘行软件的è¿è¡Œ + * 代碼簽å部分，用於é®ç½©æŸè»Ÿé«”發行商發行軟體的é‹è¡Œ +* Organization Certificates/组织è¯ä¹¦/組織è‰æ›¸ + * These certificates are used in software installing for confirming their organizations. + * 组织认è¯éƒ¨åˆ†ï¼Œç”¨äºŽå±è”½éƒ¨åˆ†ç»„织和ä¼ä¸šçš„è¯ä¹¦ + * 組織èªè‰éƒ¨åˆ†ï¼Œç”¨æ–¼é®ç½©éƒ¨åˆ†çµ„織和ä¼æ¥çš„è‰æ›¸ -### 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 å’Œç€è¦½å™¨å³å¯ã€‚** +### Usage(Online Certificates) +* [English](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)) + +### Usage(CodeSigning Certificates) +* [English](https://github.com/chengr28/RevokeChinaCerts/wiki/ReadMe_CodeSigning) +* [简体ä¸æ–‡](https://github.com/chengr28/RevokeChinaCerts/wiki/ReadMe_CodeSigning(Chinese_Simplified)) +* [ç¹é«”ä¸æ–‡](https://github.com/chengr28/RevokeChinaCerts/wiki/ReadMe_CodeSigning(Chinese_Traditional)) + +### Usage(Organization Certificates) +* [English](https://github.com/chengr28/RevokeChinaCerts/wiki/ReadMe_Organization) +* [简体ä¸æ–‡](https://github.com/chengr28/RevokeChinaCerts/wiki/ReadMe_Organization(Chinese_Simplified)) +* [ç¹é«”ä¸æ–‡](https://github.com/chengr28/RevokeChinaCerts/wiki/ReadMe_Organization(Chinese_Traditional)) + +### Thanks +* [拉黑è¯ä¹¦ è®©ä½ çš„ç”µè„‘å†ä¹Ÿè£…ä¸ä¸ŠæŸäº›è½¯ä»¶ 附è¯ä¹¦å¤§å…¨](http://blog.eqoe.cn/posts/ban-digital-cert.html) +* [Anti-China-Anit-virus](https://github.com/SCFWSE-Ye/Anti-China-Anit-virus) diff --git a/Windows/ArchiveCerts/Autoridad_de_Certificacion_Raiz_del_Estado_Venezolano_200702.crt b/Windows/ArchiveCerts/Organization/Autoridad_de_Certificacion_Raiz_del_Estado_Venezolano_200702.crt similarity index 100% rename from Windows/ArchiveCerts/Autoridad_de_Certificacion_Raiz_del_Estado_Venezolano_200702.crt rename to Windows/ArchiveCerts/Organization/Autoridad_de_Certificacion_Raiz_del_Estado_Venezolano_200702.crt diff --git a/Windows/ArchiveCerts/Autoridad_de_Certificacion_Raiz_del_Estado_Venezolano_201012.crt b/Windows/ArchiveCerts/Organization/Autoridad_de_Certificacion_Raiz_del_Estado_Venezolano_201012.crt similarity index 100% rename from Windows/ArchiveCerts/Autoridad_de_Certificacion_Raiz_del_Estado_Venezolano_201012.crt rename to Windows/ArchiveCerts/Organization/Autoridad_de_Certificacion_Raiz_del_Estado_Venezolano_201012.crt diff --git a/Windows/ArchiveCerts/RevokeChinaCerts_CodeSigning.bat b/Windows/ArchiveCerts/RevokeChinaCerts_CodeSigning.bat new file mode 100644 index 0000000000000000000000000000000000000000..383cda699736579eefa21f166f608250fd044ba5 --- /dev/null +++ b/Windows/ArchiveCerts/RevokeChinaCerts_CodeSigning.bat @@ -0,0 +1,57 @@ +:: 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 new file mode 100644 index 0000000000000000000000000000000000000000..3a8fb682abd57e738d386ae5aa7d449d97c154a0 --- /dev/null +++ b/Windows/ArchiveCerts/RevokeChinaCerts_CodeSigning_Choice.bat @@ -0,0 +1,210 @@ +:: 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 new file mode 100644 index 0000000000000000000000000000000000000000..17e25dee15e55dcd9ed34c4d358c3539f099d36d --- /dev/null +++ b/Windows/ArchiveCerts/RevokeChinaCerts_CodeSigning_Restore.bat @@ -0,0 +1,86 @@ +:: 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 new file mode 100644 index 0000000000000000000000000000000000000000..0c3e97ca0b59bddb1c43d885ffaa8ed781f620c7 --- /dev/null +++ b/Windows/ArchiveCerts/RevokeChinaCerts_Organization.bat @@ -0,0 +1,56 @@ +:: 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 new file mode 100644 index 0000000000000000000000000000000000000000..329680ed380d118b61d055a3298586acb364a60a --- /dev/null +++ b/Windows/ArchiveCerts/RevokeChinaCerts_Organization_Choice.bat @@ -0,0 +1,204 @@ +:: 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 new file mode 100644 index 0000000000000000000000000000000000000000..c038986c1493b3d6fce967fcaa7d23df370c25b6 --- /dev/null +++ b/Windows/ArchiveCerts/RevokeChinaCerts_Organization_Restore.bat @@ -0,0 +1,84 @@ +:: 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/RevokeChinaCerts_All.bat b/Windows/RevokeChinaCerts_All.bat index 39af1619ce64d65cfe04ac8ee3b9e3440f3f07ef..5e1aab2f2e2329be665c9bfaa6dce0b00b25cb79 100644 --- a/Windows/RevokeChinaCerts_All.bat +++ b/Windows/RevokeChinaCerts_All.bat @@ -16,17 +16,14 @@ ::echo "Permission check." >> %SystemPath%\TestPermission.log ::if not exist %SystemPath%\TestPermission.log (echo Require Administrator Permission. && pause > nul && Exit) ::del /f /q %SystemPath%\TestPermission.log - cd /d %~dp0 -:: Update certificates list of system. -RootSUPD_201403_x86 -::cls -cd /d %~dp0\Certs +:: Update certificates list of system. +"%~dp0\Tools\RootSUPD_201403_x86" :: Architecture check -set CertMgr=CertMgr -if "%PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432%" == "x86" set CertMgr=%CertMgr%_x86 +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) @@ -139,7 +136,7 @@ if "%PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432%" == "x86" set CertMgr=%Cert ::%CertMgr% -del -c -sha1 90D7A97592F0A3E2165DE5DA23B57701D74A298D -s -r CurrentUser AuthRoot :: Delete certificates(All part) -:: ROOTCA +:: 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 @@ -281,68 +278,69 @@ 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 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 GiantRootCA.crt -s Disallowed +%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\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 :: 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 -%CertMgr% -add -c CFCA_EV_ROOT.crt -s Disallowed -%CertMgr% -add -c UCA_Global_Root.crt -s Disallowed -%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 SZCA.crt -s Disallowed -::%CertMgr% -add -c SZCA_200307.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 ROOTCA_OSCCA.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.crt -s Disallowed -%CertMgr% -add -c Certification_Authority_Of_WoSign_200908.crt -s Disallowed -%CertMgr% -add -c Certification_Authority_Of_WoSign_StartCom_201103_1.crt -s Disallowed -%CertMgr% -add -c Certification_Authority_Of_WoSign_StartCom_201103_2.crt -s Disallowed -%CertMgr% -add -c Certification_Authority_Of_WoSign_StartCom_200609.crt -s Disallowed -%CertMgr% -add -c Certification_Authority_Of_WoSign_Chinese_StartCom.crt -s Disallowed -%CertMgr% -add -c Certification_Authority_Of_WoSign_USERTrust.crt -s Disallowed -%CertMgr% -add -c WoSign_Premium_Server_Authority_USERTrust.crt -s Disallowed -%CertMgr% -add -c WoSign_Server_Authority_USERTrust.crt -s Disallowed -%CertMgr% -add -c WoSign_SGC_Server_Authority_USERTrust.crt -s Disallowed -%CertMgr% -add -c WoSign_Client_Authority_USERTrust.crt -s Disallowed -%CertMgr% -add -c WoTrust_Premium_Server_Authority_USERTrust.crt -s Disallowed -%CertMgr% -add -c WoTrust_Server_Authority_USERTrust.crt -s Disallowed -%CertMgr% -add -c WoTrust_SGC_Server_Authority_USERTrust.crt -s Disallowed -%CertMgr% -add -c WoTrust_Client_Authority_USERTrust.crt -s Disallowed -::%CertMgr% -add -c China_Trust_Network_1.crt -s Disallowed -::%CertMgr% -add -c China_Trust_Network_2.crt -s Disallowed -::%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_Certification_Authority.crt -s Disallowed -%CertMgr% -add -c Government_Root_Certification_Authority.crt -s Disallowed -%CertMgr% -add -c TWCA_Global_Root_CA.crt -s Disallowed -%CertMgr% -add -c TWCA_Root_Certification_Authority_1.crt -s Disallowed -%CertMgr% -add -c TWCA_Root_Certification_Authority_2.crt -s Disallowed -%CertMgr% -add -c TaiCA_Secure_CA_GTE.crt -s Disallowed -%CertMgr% -add -c TWCA_Secure_CA_Baltimore.crt -s Disallowed -%CertMgr% -add -c TWCA_Secure_Certification_Authority_USERTrust.crt -s Disallowed +::%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 -:Exit :: Print to screen. +::Exit @echo. +@echo RevokeChinaCerts All version @echo Done. Please confirm the messages on screen. @echo. @pause diff --git a/Windows/RevokeChinaCerts_Base.bat b/Windows/RevokeChinaCerts_Base.bat index 87f010003c09062b7d0d38ddbb34ccb41a3578ef..ece4b9bf7a09e78e4dd978faea47dd8c57c78bf5 100644 --- a/Windows/RevokeChinaCerts_Base.bat +++ b/Windows/RevokeChinaCerts_Base.bat @@ -16,17 +16,14 @@ ::echo "Permission check." >> %SystemPath%\TestPermission.log ::if not exist %SystemPath%\TestPermission.log (echo Require Administrator Permission. && pause > nul && Exit) ::del /f /q %SystemPath%\TestPermission.log - cd /d %~dp0 -:: Update certificates list of system. -RootSUPD_201403_x86 -::cls -cd /d %~dp0\Certs +:: Update certificates list of system. +"%~dp0\Tools\RootSUPD_201403_x86" :: Architecture check -set CertMgr=CertMgr -if "%PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432%" == "x86" set CertMgr=%CertMgr%_x86 +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) @@ -89,22 +86,23 @@ 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 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 GiantRootCA.crt -s Disallowed +%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\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 -:Exit :: Print to screen. +::Exit @echo. +@echo RevokeChinaCerts Base version @echo Done. Please confirm the messages on screen. @echo. @pause diff --git a/Windows/RevokeChinaCerts_Extended.bat b/Windows/RevokeChinaCerts_Extended.bat index b5f7610e46457cbcbabe8dbf49a4eec165e86bcf..c37aad52ace04d3f52273f927c5437e4b4ae6be0 100644 --- a/Windows/RevokeChinaCerts_Extended.bat +++ b/Windows/RevokeChinaCerts_Extended.bat @@ -16,17 +16,14 @@ ::echo "Permission check." >> %SystemPath%\TestPermission.log ::if not exist %SystemPath%\TestPermission.log (echo Require Administrator Permission. && pause > nul && Exit) ::del /f /q %SystemPath%\TestPermission.log - cd /d %~dp0 -:: Update certificates list of system. -RootSUPD_201403_x86 -::cls -cd /d %~dp0\Certs +:: Update certificates list of system. +"%~dp0\Tools\RootSUPD_201403_x86" :: Architecture check -set CertMgr=CertMgr -if "%PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432%" == "x86" set CertMgr=%CertMgr%_x86 +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) @@ -141,35 +138,36 @@ 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 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 GiantRootCA.crt -s Disallowed +%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\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 :: Add certificates to CRL(Extended part) :: Move to All version. -:: %CertMgr% -add -c ROOTCA.crt -s Disallowed -%CertMgr% -add -c CFCA_GT_CA_201106.crt -s Disallowed -%CertMgr% -add -c CFCA_GT_CA_201208.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_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 SZCA.crt -s Disallowed -::%CertMgr% -add -c SZCA_200307.crt -s Disallowed +:: %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 -:Exit :: Print to screen. +::Exit @echo. +@echo RevokeChinaCerts Extended version @echo Done. Please confirm the messages on screen. @echo. @pause diff --git a/Windows/RevokeChinaCerts_Restore.bat b/Windows/RevokeChinaCerts_Restore.bat index 3ae8c2a27b9cec7a580b99c1d39ffb9122b64c22..a570c1766237ead93c53ae1438ffe9eb9c5eb7b1 100644 --- a/Windows/RevokeChinaCerts_Restore.bat +++ b/Windows/RevokeChinaCerts_Restore.bat @@ -6,27 +6,13 @@ @echo off -:: Permission check -:: Administrator permissions are not necessary(2014-09-21) -::if "%PROCESSOR_ARCHITECTURE%" == "AMD64" (set SystemPath = %SystemRoot%\SysWOW64) else (set SystemPath = %SystemRoot%\system32) -::rd "%SystemPath%\Test_Permissions" > nul 2 > nul -::md "%SystemPath%\Test_Permissions" 2 > nul || (echo Require Administrator Permission. && pause > nul && Exit) -::rd "%SystemPath%\Test_Permissions" > nul 2 > nul -::del /f /q %SystemPath%\TestPermission.log -::echo "Permission check." >> %SystemPath%\TestPermission.log -::if not exist %SystemPath%\TestPermission.log (echo Require Administrator Permission. && pause > nul && Exit) -::del /f /q %SystemPath%\TestPermission.log - -cd /d %~dp0 :: Update certificates list of system. -RootSUPD_201403_x86 - -::cls -cd /d %~dp0\Certs +cd /d %~dp0 +"%~dp0\Tools\RootSUPD_201403_x86" :: Architecture check -set CertMgr=CertMgr -if "%PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432%" == "x86" set CertMgr=%CertMgr%_x86 +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) @@ -77,7 +63,7 @@ if "%PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432%" == "x86" set CertMgr=%Cert ::%CertMgr% -del -c -sha1 90D7A97592F0A3E2165DE5DA23B57701D74A298D -s Disallowed :: Restore certificates(All part) -:: ROOTCA +:: ROOTCA OSCCA ::%CertMgr% -del -c -sha1 DBB84423C928ABE889D0E368FC3191D151DDB1AB -s Disallowed :: SRCA %CertMgr% -del -c -sha1 AE3F2E66D48FC6BD1DF131E89D768D505DF14302 -s Disallowed @@ -146,9 +132,10 @@ if "%PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432%" == "x86" set CertMgr=%Cert :: TWCA Secure Certification Authority %CertMgr% -del -c -sha1 339D811FEC673E7F731307A34C7C7523ABBE7DFE -s Disallowed -:Exit :: Print to screen. +::Exit @echo. +@echo RevokeChinaCerts Restore version @echo Done. Please confirm the messages on screen. @echo. @pause diff --git a/Windows/Certs/CertMgr.exe b/Windows/Tools/CertMgr.exe similarity index 100% rename from Windows/Certs/CertMgr.exe rename to Windows/Tools/CertMgr.exe diff --git a/Windows/Certs/CertMgr_x86.exe b/Windows/Tools/CertMgr_x86.exe similarity index 100% rename from Windows/Certs/CertMgr_x86.exe rename to Windows/Tools/CertMgr_x86.exe diff --git a/Windows/RootSUPD_201403_x86.exe b/Windows/Tools/RootSUPD_201403_x86.exe similarity index 100% rename from Windows/RootSUPD_201403_x86.exe rename to Windows/Tools/RootSUPD_201403_x86.exe