add prebuilt list

Linux/make.sh

+#!/bin/sh
+
+# Generate all
+echo "Generating ALL revoke-set"
+CA_CERTS=`ls ../Windows/Certs/Online/*.crt`
+python ./revoke_china_certs/main.py generate generate $CA_CERTS >revoke-china-certs.ALL.conf
+
+# Generate basic
+echo "Generating BASE revoke-set"
+CA_CERTS=`ls ../Windows/Certs/Online/CNNIC_*.crt ../Windows/Certs/Online/China_Internet_Network_Information_Center_EV_Certificates_Root.crt ../Windows/Certs/Online/[Suspicious]WaccBaiduCom.crt ../Windows/Certs/Online/GiantRootCA.crt`
+python ./revoke_china_certs/main.py generate generate $CA_CERTS >revoke-china-certs.BASE.conf
+
+# Generate extended
+echo "Generating EXTENDED revoke-set"
+CA_CERTS=`ls ../Windows/Certs/Online/CNNIC_*.crt ../Windows/Certs/Online/China_Internet_Network_Information_Center_EV_Certificates_Root.crt ../Windows/Certs/Online/[Suspicious]WaccBaiduCom.crt ../Windows/Certs/Online/GiantRootCA.crt ../Windows/Certs/Online/CFCA_*.crt  ../Windows/Certs/Online/UCA_*.crt  ../Windows/Certs/Online/[Suspicious]GoAgent_CA.crt`
+python ./revoke_china_certs/main.py generate generate $CA_CERTS >revoke-china-certs.EXTENDED.conf
+
+echo "DONE"

Linux/revoke-china-certs.ALL.conf

+E177CCA3CDED83AD95A395C5564AEF92
+96146908A83659D7A035148958505BAB
+80C653EE61822872F0FF21B917CAB220
+B0C9B7E3210F0F380359C8568A3C5B77
+78835B521676C4243B8378E8ACDA9A93
+FD08391FB40445C7151352C99DD88D2E
+A1F2F9B5D2C87A74B8F305F1D7E1848D
+C81C7D19AACB7193F250F852A81EBA60
+E2D837DC3B9BAD4D4A3F294255D224A0
+13A8EC6F80A5FEF0984D006F6275F15B
+6A381F6395A9CE88014EB4418717F151
+CA4C44E7000189B284C8B5C5BF058382
+74E1B6ED267A7A44303394AB7B278130
+2CCDF3C559A68464A06750FF4B4CD614
+CCC2C09A46481B76D1AB50553CA34270
+555D630097BD6A97F567AB4BFB6E6315
+2124A681C1D8F219AF4998E39DFE0BF4
+21BC82AB49C4133B4BB22B5C6B909C19
+42C9BB138085F36A093C70F4A3A338C6
+1B2E00CA2606903DADFE6F1568D36BB3
+C833A68A20FE6434DEA87170CB5A3055
+B1B8BA5AFF8D20E969BB767A41D8D743
+66D5D56AE928517C0353C5E13314A83B
+BFC8BABBC9B35302F246D88179B024ED
+440C105E4AD97B4C0BF8970DF1FE7A00
+87B23FDFFFED3644A85EB35277E36517
+D1ACA8305DC8DA91D92C44DC82F072BC
+C1A4231CA6F062E65EF425DC7CB63698
+2BB6BD9EBE7E0CDAD328176E1C796EC5
+3785445332451F20F0F395E125C4434E
+A80D6F3978B9436D77426D985ACC23CA
+81D6ED354F1F26D031D040DD8AE5810D
+4FF2F287F4C70FD1D9B6C4D916083779
+6D38C49B22244CA3A8B3A09345E157FA
+A12DEDEB8A3B882FFA38F386A4FBBCF2
+601324F09AE98849581B37C9A1905724
+DA6971448DF82BEAA15356B2F462248D
+56B120861B0AB06138001BC367CF0CCC
+2AA1218D094FA549395E17371FEDCBEB
+E30CD7CD1D325DD8BD01EE162AD2B586
+F9037ECFE69E3C737A2A900769FF2B96
+AA088FF6F97BB7F2B1A71E9BEAEABD79
+774AF42C9DB027B747B515E4C762F0FC
+A44B3B9C3A873F91D8AD8C95EA7CF8E7
+5CCE66B60CF07FC0FF44264AAE46045A
+DFC749F07F9569BB075D8B1C0390CC46
+C1D951C084B86A75E82FD7D65F7EAC46
+1A14E85B2F6BF9D78A0095F004B3074C
+8F91E7EEE3FCDA86CAFCDC70EDB7B70C
+2DD66B6F71EADCE0C9E178FCC39718F9
+27F01F3239335A801675F7802E929A4C
+E7CA95AFB4EC4084A1482850535D1641
+57E2D48EE3F10CB0F69F373078FF64D0
+DB4205DA5C1EDDFF6B77402DB8E0E4B0
+2629D9C0865F15E41CEB3BCED124266B
+9269560E27D0BEA46BED9A8C117242DF
+E2ECB113E5D9FAD425563DC2DD9D7968

Linux/revoke-china-certs.BASE.conf

+555D630097BD6A97F567AB4BFB6E6315
+21BC82AB49C4133B4BB22B5C6B909C19
+42C9BB138085F36A093C70F4A3A338C6
+2BB6BD9EBE7E0CDAD328176E1C796EC5
+2AA1218D094FA549395E17371FEDCBEB

Linux/revoke-china-certs.EXTENDED.conf

+74E1B6ED267A7A44303394AB7B278130
+2CCDF3C559A68464A06750FF4B4CD614
+CCC2C09A46481B76D1AB50553CA34270
+555D630097BD6A97F567AB4BFB6E6315
+21BC82AB49C4133B4BB22B5C6B909C19
+42C9BB138085F36A093C70F4A3A338C6
+2BB6BD9EBE7E0CDAD328176E1C796EC5
+56B120861B0AB06138001BC367CF0CCC
+2AA1218D094FA549395E17371FEDCBEB
+DFC749F07F9569BB075D8B1C0390CC46
+C1D951C084B86A75E82FD7D65F7EAC46
+1A14E85B2F6BF9D78A0095F004B3074C
+8F91E7EEE3FCDA86CAFCDC70EDB7B70C

Linux/revoke_china_certs/main.py

@@ -22,19 +22,19 @@ def _normalize_hash(hash_val):
 
 def usage():
     print ""
-    print "revoke_china_certs.py"
+    print "%s" % sys.argv[0]
     print ""
     print "-------------------------------------"
     print "Generate new ca-certificates.conf that revokes certs in %s according to %s." % (DEFAULT_CERT_CONF, DEFAULT_HASH_FILE)
-    print "\trevoke_china_certs.py revoke"
+    print "\t%s revoke" % sys.argv[0]
     print "Generate new ca-certificates.conf that revokes certs in [cert_conf] according to [revoke_list]."
-    print "\trevoke_china_certs.py revoke [cert_conf] [revoke_list]"
+    print "\t%s revoke [cert_conf] [revoke_list]"  % sys.argv[0]
     print "Generate new ca-certificates.conf that revokes certs in configurations from STDIN according to [revoke_list]."
-    print "\trevoke_china_certs.py revoke - [revoke_list]"
-    print "\teg: cat /etc/ca-certificates.conf | revoke_china_certs.py revoke - [revoke_list]"
+    print "\t%s revoke - [revoke_list]" % sys.argv[0]
+    print "\teg: cat /etc/ca-certificates.conf | %s revoke - [revoke_list]" % sys.argv[0]
     print "Generate revocation list"
-    print "\trevoke_china_certs.py generate [certs to revoke]"
-    print "\teg: revoke_china_certs.py generate ../../Windows/Certs/Online/*"
+    print "\t%s generate [certs to revoke]" % sys.argv[0]
+    print "\teg: %s generate ../../Windows/Certs/Online/*" % sys.argv[0]
     print ""
 
 def _hash_dict(files):