Skip to content

Commit d0c8007

Browse files
diracdeltasdiracdeltas
committed
Merge branch 'master' into http-nowhere
Conflicts: src/components/https-everywhere.js
2 parents 2460abb + a57be18 commit d0c8007

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+654
-229
lines changed

‎src/chrome/content/code/HTTPSRules.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ function RuleSet(id, name, xmlName, match_rule, default_off, platform) {
3030
this.name = name;
3131
this.xmlName = xmlName;
3232
this.notes = "";
33+
3334
if (match_rule) this.ruleset_match_c = new RegExp(match_rule);
3435
else this.ruleset_match_c = null;
3536
if (default_off) {
@@ -479,6 +480,7 @@ const HTTPSRules = {
479480
}
480481
},
481482

483+
482484
rewrittenURI: function(alist, input_uri) {
483485
// This function oversees the task of working out if a uri should be
484486
// rewritten, what it should be rewritten to, and recordkeeping of which

‎src/chrome/content/code/NSS.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,10 @@ NSS.initialize = function(nssPath) {
3131
try {
3232
sharedLib = ctypes.open(nssPath);
3333
} catch (e) {
34-
dump("Failed to find nss3 in installed directory, checking system paths.\n");
35-
sharedLib = ctypes.open(ctypes.libraryName("nss3"));
34+
Components.utils.import("resource://gre/modules/Services.jsm");
35+
var nssFile = Services.dirsvc.get("GreD", Ci.nsILocalFile);
36+
nssFile.append(ctypes.libraryName("nss3"));
37+
sharedLib = ctypes.open(nssFile.path);
3638
}
3739

3840
NSS.types = new Object();

‎src/chrome/content/code/commonOCSP.json‎

Lines changed: 287 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,287 @@
1+
["http://ocsp.pca.dfn.de/OCSP-Server/OCSP",
2+
"http://ocsp.digicert.com",
3+
"http://ocsp.verisign.com",
4+
"http://ocsp.comodoca.com",
5+
"http://clients1.google.com/ocsp",
6+
"http://ocsp.usertrust.com",
7+
"http://ocsp.disa.mil",
8+
"http://ocsp.quovadisglobal.com",
9+
"http://ocsp.nsn0.rcvs.nit.disa.mil",
10+
"http://ocsp.camerfirma.com",
11+
"http://ocsp.thawte.com",
12+
"http://ocsp.serverpass.telesec.de/ocspr",
13+
"http://ocsp.certum.pl",
14+
"http://ocsp.certisign.com.br",
15+
"http://ocsp.entrust.net",
16+
"http://telstra-ocsp.pki.telstra.com.au/ocsp",
17+
"http://ocsp.a-trust.at/ocsp",
18+
"http://ocsp.godaddy.com",
19+
"https://ocspaces.trustdst.com",
20+
"http://ocsp.identrust.com",
21+
"http://ocsp.pki.auth.gr",
22+
"http://ocsp2.globalsign.com/gsorganizationvalg2",
23+
"http://ocsp.starfieldtech.com",
24+
"http://ocsp.pki.bayern.de:8080",
25+
"http://ocsp.netsolssl.com",
26+
"http://ocsp.europki.org:8026",
27+
"http://ocsp.starfieldtech.com",
28+
"http://ocsp.treas.gov",
29+
"http://ocsp.trust-provider.com",
30+
"http://ocsp.rcsc.lt/ocspresponder.rcsc",
31+
"http://ocsp.globessl.com",
32+
"http://ocsp1.wosign.com/ca1",
33+
"http://gtssl-ocsp.geotrust.com",
34+
"http://ocsp.turktrust.com.tr",
35+
"http://ocsp.quovadisoffshore.com",
36+
"http://eva.orc.com",
37+
"http://ocsp.incosolutions.com/ocsp",
38+
"http://validator.wellsfargo.com",
39+
"http://jjedsocsp1.jnj.com",
40+
"http://ocsp.cybertrust.ne.jp/OcspServer",
41+
"http://ocsp.digsigtrust.com",
42+
"http://ocsp.trust.teliasonera.com",
43+
"http://ocsp.harica.gr",
44+
"http://ocsp.pki-services.siemens.com",
45+
"http://sd.symcd.com",
46+
"http://ocsp.catcert.cat",
47+
"http://ocsp.certificateservices.eads.com",
48+
"http://dc/ocsp",
49+
"http://ocsp.wosign.com/ca",
50+
"http://ocsp.swissdigicert.ch/rubin",
51+
"http://ocsp.unimelb.edu.au/ocsp",
52+
"http://ocsp.gandi.net",
53+
"http://ca.multistructure.co.id/ocsp",
54+
"http://ocsp.buypass.no/ocsp/BPOcsp",
55+
"http://rapidssl-ocsp.geotrust.com",
56+
"http://ocsp.tcclass3-II.trustcenter.de",
57+
"http://ocsp2.globalsign.com/gsalphasha2g2",
58+
"http://ldap.takata-petri.com:2560",
59+
"http://ocsp.dpwn.net",
60+
"http://ocsp.certyfikatyssl.pl",
61+
"https://ocsp.quovadisoffshore.com",
62+
"http://ocsp.swissdigicert.ch/smaragd",
63+
"http://sureseries-ocsp.cybertrust.ne.jp/OcspServer",
64+
"http://wongtaisin.ms.local/ocsp",
65+
"http://nsc.vrm.lt/OCSP/ocspresponder.nsc",
66+
"http://ocsp.webspace-forum.de",
67+
"http://ocsp.luxtrust.lu",
68+
"https://ca.e-szigno.hu/aocsp",
69+
"http://ocsp.trustsign.com.br",
70+
"http://ocspape.cert.fnmt.es/ocspape/OcspResponder",
71+
"http://telstra-ocsp.pki.telstra.com.au/ocsp",
72+
"http://ocsp.tcclass2.trustcenter.de",
73+
"http://ocsp.inmeta.net/ejbca/publicweb/status/ocsp",
74+
"http://igc.auf.org/ocsp",
75+
"http://ocsp.certification.tn",
76+
"http://ocsp.globaltrust.eu",
77+
"http://ocsp.e-tugra.com/status/ocsp",
78+
"http://ocsp.bezeq.com",
79+
"http://ocsp.nsn0.rcvs.gds.disa.mil",
80+
"http://certinfo-ocsp.ubs.com:53417",
81+
"http://ocsp.tbs-x509.com",
82+
"http://ocsp.ll.mit.edu",
83+
"http://pki.utg.ua/ocsp",
84+
"http://ocsp.accv.es",
85+
"http://crl.itsumo.pl/ocsphttp://corppki/ocsp",
86+
"http://tr-dc-r2.telering.biz/ocsp",
87+
"http://ocsp.eme.lv/responder.eme",
88+
"http://ocsp2.globalsign.com/gsalphag2",
89+
"http://ocsp.ssl.com",
90+
"http://ocsp.certificadodigital.com.br/serasa_cd2006",
91+
"http://la-email.corp.valueclick.com/ocsp",
92+
"http://ocsp.startssl.com/sub/class3/server/ca",
93+
"http://acbridge.ds.commun.test.fc2consortium.org:8080/ejbca/publicweb/status/ocsp",
94+
"http://remote.hirschmann.nl/ocsp",
95+
"http://ocsp1jca.defence.gov.sg",
96+
"http://ocsp02.telesec.de/ocspr",
97+
"http://certs.vonagenetworks.net/ocsp/vonsca",
98+
"http://ca-ocsp.disig.sk",
99+
"http://www.isscorp.com/PKI/ra/ocsp",
100+
"http://ocsp.digi-sign.com",
101+
"http://ocsp.certificadodigital.com.br/serasarfbv1",
102+
"http://certificates.medsigroup.ru/ocsp",
103+
"http://ocsp.bee.vimpelcom.ru/ocsp",
104+
"http://cert1.cert.internal.loc1.gathowin.net/ocsp",
105+
"http://ocsp-ext.pki.wellsfargo.com",
106+
"http://ocsp.innossl.com",
107+
"http://ocsp.pcf.pl/ocsp",
108+
"http://nts15.etoncollege.org.uk/ocsp",
109+
"http://ocsp.dreamhost.com",
110+
"http://ocspISAca.cert.fnmt.es/ocspISAca/OcspResponder",
111+
"http://bt1svl0a.bpa.bouyguestelecom.fr/ocsp",
112+
"http://ocsp.co.vectis.local/ocsp",
113+
"http://localhost:8080/ejbca/publicweb/status/ocsp",
114+
"http://ocsp.siteblindadocerts.com",
115+
"http://corpcert.app.corpintra.net/ocsp",
116+
"http://ocsp.nlss.com",
117+
"http://ocsp.bobo-rousselin.com",
118+
"http://cert.bioscomputers.com/ocsp",
119+
"http://ocsp.lienvietpostbank.com.vn/ocsp",
120+
"http://sslocsp.twca.com.tw",
121+
"http://ocsp.mdais.co.il",
122+
"http://pki.sana-bb.de/ocsp",
123+
"http://ocsp.wisekey.com",
124+
"https://ocsp.rcsc.lt/ocspresponder.rcsc",
125+
"http://ocsp.startssl.com/sub/class2/server/ca",
126+
"http://ocsp-cpki.telekom.de/ocsp",
127+
"http://ocsp2.ssc.lt:2560",
128+
"http://ocsp.it.point/RMGRCA/http://ocsp.extranet.royalmail.com/RMGRCA",
129+
"http://eca.ocspts.identrust.com",
130+
"http://ocsp.vkb-bank.com/ocsp",
131+
"http://pki.automobiletechnologies.com/ocsp",
132+
"http://ocsp.g4s.no/ocsp",
133+
"http://vpn.ozero.com/ocsp",
134+
"http://ocsp.village-roadshow.com/ocsp",
135+
"http://ocsp.groupensia.com/ocsp",
136+
"http://pki.rosautoprom.ru/ocsp",
137+
"http://ogbl-ocsp2.ogbl.lan/ocsp",
138+
"http://ocsp.southernco.com/ocsp",
139+
"http://ocsp.swiss.signdemo.com",
140+
"http://ocsp.itexcellence.rs/ocsp",
141+
"http://www.cepsa.com/pki/ocsp",
142+
"https://ocspaces.identrust.com",
143+
"http://ocsp.dtica.eu",
144+
"http://www.tys.org/aia",
145+
"http://ocsp2.globalsign.com/gsextendvalg2",
146+
"http://caors.wiltshire.ac.uk/ocsp",
147+
"http://ocsp1.ssp-strong-id.net/SSP-CA-A1",
148+
"http://cert.econgas.com/ocsp",
149+
"http://ocsp.wienerberger.net/ocsp",
150+
"http://ocsp.pki.wayport.net:2560",
151+
"http://pkib.mallesons.com/ocsp",
152+
"http://ocsp.ovh.com",
153+
"http://ocsp.certificadodigital.com.br/serasacdv1",
154+
"http://pkiva.indra.es",
155+
"http://itcert.stanford.edu/ocsp",
156+
"http://certenroll.bogdanov-associates.com/ocsp",
157+
"http://srv-pki/ocsp",
158+
"http://ocsp.godaddy.com",
159+
"http://ocsp.pki.slb.com/ocsp",
160+
"http://ocsp.swisssign.net",
161+
"http://cert.naftogaz.com/ocsp",
162+
"http://ocsp.uk.deloitte.com",
163+
"http://ocsp.comodoca3.com",
164+
"http://ocsp.exzumin.de/ocsp",
165+
"http://ocsp.msocsp.com",
166+
"http://cdp2.nis.rs/ocsp",
167+
"http://corptestcert.app.corpintra.net/ocsp",
168+
"http://ocsp.comodoca2.com",
169+
"http://ocsp.ersca.com",
170+
"http://ocsp.xth.cc",
171+
"http://ocsp1.ssp-strong-id.net/VA-SSP-CA-B2",
172+
"http://ocsp.vnpt-ca.vn/responder",
173+
"http://ocspts.identrust.com",
174+
"http://ocsp2.globalsign.com/gsdomainvalg2",
175+
"http://pkiva.bde.es",
176+
"http://certs.mapservices.fr/ocsp",
177+
"http://ino.inosoft.de/ocsp",
178+
"http://rootca.poclabs.net/ocsp",
179+
"http://pki.rtc-leasing.ru/ocsp",
180+
"http://ocsp.startssl.com/ca",
181+
"http://ocsp.ca.vodafone.com/ocsp",
182+
"http://ocsp.cs.auscert.org.au",
183+
"http://ocsp.tcclass2-II.trustcenter.de",
184+
"http://www.er76.ru/ocsp",
185+
"http://ocsp.walgreens.com/ocsp",
186+
"http://www.pki.nosc.us/ocsp",
187+
"http://test_pki1/ocsp",
188+
"http://ocsp.mytrc.net/ocsp",
189+
"http://certs.ankalagon.ru/ocsp",
190+
"http://www.ocsp.gpo.gov",
191+
"http://ocsp.bayanca.ir",
192+
"http://va.pfizer.com:1025",
193+
"http://certificates.dnv.com/ocsp",
194+
"http://ocsp.orapharma.com/ocsp",
195+
"http://ocsp.seattlecca.org/ocsp",
196+
"http://backbone.cnsd.interno.it/ocsp",
197+
"http://nyppki02/ocsp",
198+
"http://ocsp2.globalsign.com/gsorganizationvalsha2g2",
199+
"http://gtssl2-ocsp.geotrust.com",
200+
"http://ocsp.tcuniversal-I.trustcenter.de",
201+
"http://ocsp.register.com",
202+
"http://ocsp.ncdc.gov.sa",
203+
"http://pki.life.com.by/ocsp",
204+
"http://ocsp.sgssl.net",
205+
"http://pki.gmprint.local/ocsp",
206+
"http://pki.solitdev.com/ocsp",
207+
"http://ocsp.dics.ua/ocsp",
208+
"http://ocsp.pre.swissdigicert.ch/rubin",
209+
"http://ocsp.affirmtrust.com/commev",
210+
"http://aia.gdir.vt.ru/ocsp",
211+
"http://ocsp.averius.nl/ocsp",
212+
"http://ocsp.bechtel.com/ocsp",
213+
"http://ac.ds.commun.test.fc2consortium.org:8080/ejbca/publicweb/status/ocsp",
214+
"http://cert-services.e-control.at/OCSP?ca=EControl_IntermediateCA",
215+
"http://nfiocsp.managed.entrust.com",
216+
"http://cert.bernards.com/ocsp",
217+
"http://bhca2.baker-hostetler.com/ocsp",
218+
"http://pki.suva.ch/ocsp",
219+
"http://EVSecure-ocsp.verisign.com",
220+
"http://ocsp.go",
221+
"http://pki.wabag.com/ocsp",
222+
"http://ocsp.startssl.com/sub/class4/server/ca",
223+
"http://nfi2.eva.orc.com",
224+
"http://onsite-ocsp.verisign.com",
225+
"http://ocspsslv3.kamusm.gov.tr",
226+
"http://ocsp.pki.belgium.be",
227+
"https://www.isscorp.com/PKI/ra/ocsp",
228+
"http://ocsp.statoil.com:3502",
229+
"http://pki-ocsp.allscriptscloud.com/ocsp",
230+
"http://swoop-pki.swoopin.com/ocsp",
231+
"http://kzatpki0002.okioc.com/ocsp",
232+
"http://ocsp.policia.es",
233+
"http://ocsp.startssl.com/sub/class1/client/ca",
234+
"http://dc01/ocsp",
235+
"http://ocsp2.pki.wayfair.com/ocsp",
236+
"http://10.1.101.2/publicweb/status/ocsp",
237+
"http://ocsp.bt.com/ocsp",
238+
"http://ocsp.sanofi-aventis.com/ocsp",
239+
"http://dc-01.raise.group",
240+
"http://ocsp.spar-ics.eu/ocsp",
241+
"http://ocsp.vodokanal.spb.ru/ocsp",
242+
"http://socsp.turktrust.com.tr",
243+
"http://ocsp.thermocolor.com/ocsp",
244+
"http://ocsp.lisec-sw.com",
245+
"http://ocsp.csctrustedsecure.com",
246+
"http://houpki2.nov.com/ocsp",
247+
"http://ocsp.bwinservices.com/ocsp",
248+
"http://ocsp2.globalsign.com/gsextendvalsha2g2",
249+
"http://ocsp.tcclass3.trustcenter.de",
250+
"http://ocsp-b.pki.wayport.net:2560",
251+
"http://devdc01.dev.gatesfoundation.org/ocsp",
252+
"http://certsrv1.dc1.thomson-webcast.net/ocsp",
253+
"http://relay.systemshouse.ru/ocsp",
254+
"http://gold-root-g2.ocsp.swisssign.net",
255+
"http://pecs1.unisys.com/ocsp",
256+
"http://ocsp.europeanssl.eu",
257+
"http://gw.idsaas.de/ocsp",
258+
"http://ocsp.tcs.terena.org",
259+
"http://ocsp.trendmicro.com/tmca",
260+
"http://ocsp-ent.pki.wellsfargo.com",
261+
"http://www.meridian-capital.kz/ocsp",
262+
"http://ca.x-any.com/ocsp",
263+
"http://crl.inditex.com/ocsp",
264+
"http://ocsp.firmaprofesional.com",
265+
"http://ocsp2.globalsign.com/gsdomainvalsha2g2",
266+
"http://exchange.cdl.cz/ocsp",
267+
"http://pkicvs.cisco.com/pki/ocsp",
268+
"http://ocsp.affirmtrust.com/premev",
269+
"http://ocsp.icewarp.com",
270+
"http://ocsp.ferbritas.pt/ocsp",
271+
"http://cert.energokaskad.com/ocsp",
272+
"http://ocsp.utn.com.ua:2560",
273+
"http://ocsp.affirmtrust.com/ntwkev",
274+
"http://ocsp.omniroot.com/baltimoreroot",
275+
"http://ocsp.shamusclan.com",
276+
"http://ocsp.wurthnet.com/ocsp",
277+
"http://ocsp.pkic.es/ocsp",
278+
"http://ocsp.strixchomutov.cz",
279+
"http://sha2ocsp.dnsalias.com/responder",
280+
"http://ocsp-test.ncdc.gov.sa",
281+
"http://ocsp.sysadmins.lv",
282+
"http://cert.incoma.ru/ocsp",
283+
"http://ocsp.north-winds.org",
284+
"http://iis1.eeza.csic.es/ocsp",
285+
"http://pki.winextreme.org/ocsp",
286+
"http://ocsp.startssl.com/sub/class1/server/ca",
287+
"http://pki.eduuni.local/ocsp"]

‎src/chrome/content/rules/Appenzeller_Kantonalbank.xml‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎src/chrome/content/rules/Apple.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@
298298
-falsemixed should be merged for Ffx 24.
299299
300300
-->
301-
<ruleset name="Apple.com (parial)">
301+
<ruleset name="Apple.com (partial)">
302302

303303
<target host="apple.com" />
304304
<target host="*.apple.com" />

‎src/chrome/content/rules/Berner_Kantonalbank.xml‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎src/chrome/content/rules/Billiger.de.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<ruleset name="billiger.de (partial)">
1111

1212
<target host="billiger.de" />
13-
<target host="www.billiger.de" />
13+
<target host="*.billiger.de" />
1414

1515

1616
<!-- Tracking cookies:
@@ -22,4 +22,5 @@
2222
<rule from="^http://(www\.)?billiger\.de/(combine/|favicon\.ico|img/|vnt_gc/img/|js/|stats/graphite\.gif)"
2323
to="https://$1billiger.de/$2" />
2424

25+
<rule from="^http://api-img\.billiger\.de/" to="https://api-img.billiger.de/" />
2526
</ruleset>

0 commit comments

Comments
 (0)