Skip to content
This repository was archived by the owner on Nov 6, 2023. It is now read-only.

Commit 99bd9aa

Browse files
dvd2000dvd2000
authored
Merge pull request #1 from EFForg/master
Updating fork
2 parents f2c0974 + e4a202d commit 99bd9aa

64 files changed

Lines changed: 1271 additions & 847 deletions

Some content is hidden

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

‎LICENSE.txt‎

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,15 @@
11
HTTPS Everwyhere:
2-
Copyright © 2010-2012 Mike Perry <mikeperry@fscked.org>
3-
Peter Eckersley <pde@eff.org>
4-
and many others
5-
(Licensed GPL v2+)
2+
Copyright © 2010-2017
3+
Licensed GPL v2+
64

75
Incorporating code from NoScript,
86
Copyright © 2004-2007 Giorgio Maone <g.maone@informaction.com>
97
Licensed GPL v2+
108

11-
Incorporating code from Convergence
9+
Incorporating code from Convergence (NSS.js)
1210
Copyright © Moxie Marlinspike
1311
Licensed GPL v3+
1412

15-
Incorporating code from URI.js
16-
Copyright © Rodney Rehm
17-
Licensed MIT, GPL V3
18-
19-
Incorporating code from js-lru
20-
Copyright © 2010 Rasmus Andersson
21-
Licensed MIT
22-
2313
The build system incorporates code from Python 2.6,
2414
Copyright © 2001-2006 Python Software Foundation
2515
Python Software Foundation License Version 2
26-
27-
Net License: GPL v3+ (complete tree)
28-
GPL v2+ (if Moxie's NSS.js is absent)
29-
30-
31-
Text of MIT License:
32-
====================
33-
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
34-
35-
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
36-
37-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

‎chromium/manifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,5 @@
3939
"storage",
4040
"<all_urls>"
4141
],
42-
"version": "2017.4.5"
42+
"version": "2017.4.19"
4343
}

‎src/Changelog‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
Firefox 5.2.15 / Chrome 2017.4.19
2+
* Ruleset updates
3+
14
Firefox 5.2.14 / Chrome 2017.4.5
25
* Ruleset updates
36

‎src/META-INF/manifest.mf‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
22

33
Name: install.rdf
44
Digest-Algorithms: MD5 SHA1
5-
MD5-Digest: nlZhnPqxn/Y1unK9/yNdqw==
6-
SHA1-Digest: cVCY8IeIMX9ATMqzH91URgE4eQY=
5+
MD5-Digest: dbChy2rj5rTuwf541H5AeA==
6+
SHA1-Digest: itOM99IP0bw2PjbMXMp+B793hY4=
77

88
Name: chrome.manifest
99
Digest-Algorithms: MD5 SHA1
@@ -12,8 +12,8 @@ SHA1-Digest: Bhc67dKsPDaUhKWYKZqJDYj7Vjs=
1212

1313
Name: Changelog
1414
Digest-Algorithms: MD5 SHA1
15-
MD5-Digest: KRLEYuHup9clud1NA5iUuA==
16-
SHA1-Digest: eXvBQ9MnWB5rADbYZx46SUErvEo=
15+
MD5-Digest: zoLGs1tPLxcrD1aPP32kIA==
16+
SHA1-Digest: WCkXPHcj8eVJhbMk4E7KxsYCmcY=
1717

1818
Name: chrome/content/about.js
1919
Digest-Algorithms: MD5 SHA1
@@ -22,8 +22,8 @@ SHA1-Digest: LLBVoXQCCBga94313zUlZ11orfw=
2222

2323
Name: chrome/content/about.xul
2424
Digest-Algorithms: MD5 SHA1
25-
MD5-Digest: R79gFavf7kbnCWdKI3xF5A==
26-
SHA1-Digest: JjFXBTcdzF36Z/ZHu3uleelRTS4=
25+
MD5-Digest: b5uHAvnjWCUj62lfBtB2BQ==
26+
SHA1-Digest: GCwDQgZ83eEnBOxpGXwwzaHKJB0=
2727

2828
Name: chrome/content/meta-preferences.xul
2929
Digest-Algorithms: MD5 SHA1
@@ -52,8 +52,8 @@ SHA1-Digest: GSMCtGvcHTDq4BKI+kOzOggSBeY=
5252

5353
Name: chrome/content/rulesets.json
5454
Digest-Algorithms: MD5 SHA1
55-
MD5-Digest: u96eURTwwir8lvSvArItrw==
56-
SHA1-Digest: fSVgIYYRXqTq3evFuqiD/YFW7NY=
55+
MD5-Digest: Rinsn6gSzTLGMAYTyNBk5w==
56+
SHA1-Digest: NwDjp12Ss3U1iLaY3LAVEE6n7TE=
5757

5858
Name: chrome/content/toolbar_button.js
5959
Digest-Algorithms: MD5 SHA1
@@ -92,8 +92,8 @@ SHA1-Digest: 1x+yUhg2hREEc003OpJiu7y02lQ=
9292

9393
Name: chrome/content/code/HTTPS.js
9494
Digest-Algorithms: MD5 SHA1
95-
MD5-Digest: aYCmmzONfroC/F342hEruA==
96-
SHA1-Digest: MjJFETkpXT2WTbkGY/PuowIbadU=
95+
MD5-Digest: cdNnSQ/SQ1PCPcNnMrx/Zw==
96+
SHA1-Digest: z1VFdNvbAn/oa1Lky652XAWupXM=
9797

9898
Name: chrome/content/code/HTTPSRules.js
9999
Digest-Algorithms: MD5 SHA1
@@ -122,8 +122,8 @@ SHA1-Digest: id/qGgzRgxSXMMttuM2RKw+vpYY=
122122

123123
Name: chrome/content/code/X509ChainWhitelist.js
124124
Digest-Algorithms: MD5 SHA1
125-
MD5-Digest: H47BG3cI+0kf9u3nDrpNuQ==
126-
SHA1-Digest: yJpmViqYgAhWsHxn2fFXesVDi+A=
125+
MD5-Digest: VtXRA5R1YqdmIYNyCUo3Fw==
126+
SHA1-Digest: tBBk5lmSTJM8uCBENfbSAlBCMns=
127127

128128
Name: chrome/locale/README.txt
129129
Digest-Algorithms: MD5 SHA1
@@ -1557,8 +1557,8 @@ SHA1-Digest: xrBgVJCRqLeGb/wPIqZ7EdXqXgU=
15571557

15581558
Name: chrome/locale/lo/https-everywhere.dtd
15591559
Digest-Algorithms: MD5 SHA1
1560-
MD5-Digest: XqgA6bbDAgQIY4g6p6b/nw==
1561-
SHA1-Digest: T20MZ2C9scBOYipJ71gTMECsSic=
1560+
MD5-Digest: XZHAUaEzGXMG4hHkxNCzFA==
1561+
SHA1-Digest: AuKWzvdeNWFkbH3OPNehpP7wuQ4=
15621562

15631563
Name: chrome/locale/lo/https-everywhere.properties
15641564
Digest-Algorithms: MD5 SHA1
@@ -2017,8 +2017,8 @@ SHA1-Digest: xrBgVJCRqLeGb/wPIqZ7EdXqXgU=
20172017

20182018
Name: chrome/locale/pt/https-everywhere.dtd
20192019
Digest-Algorithms: MD5 SHA1
2020-
MD5-Digest: a6PpmUZZPwddVMmY7mSFZA==
2021-
SHA1-Digest: W65AAKCVMx+YeNHsOENwH2tayi4=
2020+
MD5-Digest: opa9ZoDHuLCvFZJ+XLmuVw==
2021+
SHA1-Digest: tB92//OaaMf5YZiEDmrAULZ8DEY=
20222022

20232023
Name: chrome/locale/pt/https-everywhere.properties
20242024
Digest-Algorithms: MD5 SHA1
@@ -2362,8 +2362,8 @@ SHA1-Digest: xrBgVJCRqLeGb/wPIqZ7EdXqXgU=
23622362

23632363
Name: chrome/locale/sv/https-everywhere.dtd
23642364
Digest-Algorithms: MD5 SHA1
2365-
MD5-Digest: xk0yklLYF4j6wx64+H4ekA==
2366-
SHA1-Digest: wAkCIfgJmtz+BHXUCYJQ6nPVOHQ=
2365+
MD5-Digest: 866OpwER96plRQBoxVhCpA==
2366+
SHA1-Digest: IJ0xoT0KcTdB+0rFgBx1VFjxGBI=
23672367

23682368
Name: chrome/locale/sv/https-everywhere.properties
23692369
Digest-Algorithms: MD5 SHA1

‎src/META-INF/mozilla.rsa‎

0 Bytes
Binary file not shown.

‎src/META-INF/mozilla.sf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Signature-Version: 1.0
2-
MD5-Digest-Manifest: K0PcTtmv/c77U5ewdUZLFw==
3-
SHA1-Digest-Manifest: P1Z3u+4q1nSsj/aYF8LiOUu5sMk=
2+
MD5-Digest-Manifest: EfKKDNKmBB8wB+J455mCKw==
3+
SHA1-Digest-Manifest: 1T6VtrXIbpcRKIaVrbVv9RW2DGg=
44

‎src/chrome/content/about.xul‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
<groupbox>
4040
<caption label="&https-everywhere.about.version;" />
41-
<label>5.2.14</label>
41+
<label>5.2.15</label>
4242
</groupbox>
4343

4444
<groupbox>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ const X509ChainWhitelist = {
101101
'17094402A4BDFBFA5780FEE086E2D0DA5F4D5EE3107A1E934F9023A1F7E1163B' : true,
102102
'1715E347E92C85ADCEFCA2ED0C4B56DF7D7A3FA9C834B1F2DFA7CE115DC8DBC4' : true,
103103
'177CF252B8F289F84D70CF0C5F3BF4DC2F4B14019D777F62628BA1C74ADB567E' : true,
104-
'1781FC3318F87AA70A6762F2A6A65D5F5DDCDE992DED94D110EB85A4745E9838' : true,
105104
'178437C1DC169BA86687755E982E2CAEADE216ADD8A163157614A66F34325FDE' : true,
106105
'1882C2D8D817DD1078933D244E379CFC5BA8EAAE302BCF9FA22636B08FAC86CE' : true,
107106
'19230A5E183CB5DD90409C54F01075BB43D5608CE9C322EA3CA3724144FE03B6' : true,
@@ -205,7 +204,6 @@ const X509ChainWhitelist = {
205204
'31E1681F2BFF6FEDAB9643A60CEDFB2315E62408EC8AF54CA9252895E34B61A8' : true,
206205
'321EB0C04DEBB24086B738BE5831A4D968DBF3FA26E610C367B7F6B241AC2B6B' : true,
207206
'322EC261687A3829C2C0F1FF70B3E6956F5EC01497F58A422A099521BC236D24' : true,
208-
'323C8E2033ADE1E8793BFDB767213691270543CF88FD6356194E5A8E87A755E6' : true,
209207
'3247CA2A4D20116F5513937011CB89834D690D5FC864C788061B13AC826B0A64' : true,
210208
'32ED76AE2E09C58605B9C2BF6A27080DB8C7EEB70889BCCCEA72104C7F33F95D' : true,
211209
'3324199E8208DE00D12FC927DC434DF39C54E591EE8CA42B31B505FDF344E5F7' : true,
@@ -306,6 +304,7 @@ const X509ChainWhitelist = {
306304
'48E8ED415FD8EFB4407D0C67F3A4EBF15286569D29D566DEFA8B7AD8F135A5CD' : true,
307305
'49558145AB82E7F795C2E45402260F1AD1ED43D4DF145CF2577BA1615CD00843' : true,
308306
'4A69353F89397B7FBF7B34B298BBA87342EE33C9F5B75660195F8B308FC892E9' : true,
307+
'4A787F7CB8AC54A1EABAB27A47F6EACE47C2BE2076C2097973E035DA5B507C39' : true,
309308
'4A978057E01B2F443BFC218B48E7D00D2542DBA58ABD2609ECE7E152A8F86292' : true,
310309
'4AE85007A69D54CCEA04A3FF18B66CA5AAAC43342506963BF910E2C2C3AC8816' : true,
311310
'4AF86DB451BCBBB3BD8BB3D5982DBF4451CD96394540DE9FE6210E69F7C2F8D3' : true,
@@ -653,7 +652,6 @@ const X509ChainWhitelist = {
653652
'A009E34551A5963FBA989DEC7806F779CFB3BA34C5DD675A331BD55410F8EF33' : true,
654653
'A024128989862D72CA20143420C8437F2E91D063A2D85E3B44C0E9F125DC7E59' : true,
655654
'A039ECC540EAB00B2B41960B77171CB8B451230566C595F4631651A389C49A7F' : true,
656-
'A03F32B0A7677B8D7102BCE24F121EE6CC503FF173C43CDD6B914BC69D954ACA' : true,
657655
'A0516DBC87026108B694F794B6C040585995F9C7BB00D08BF9F817D4F54069B6' : true,
658656
'A08110BB7D0D5F694D791F82071E44B4C968D4990C73A402B25E0E0ACA5EA6E7' : true,
659657
'A09F67FB2E70E4BAD3197A8CF7273531D0125CBD5BB05BE09E53CF582CA90E41' : true,
@@ -667,7 +665,6 @@ const X509ChainWhitelist = {
667665
'A20571EB3FCEFA102CE99C087F9217BD081AAA8DBB618558D49EC7364AE2CA72' : true,
668666
'A2178486A6B30A68CF5FE41C0968CB43B78E5E569B163027419B8B6C99AF0053' : true,
669667
'A2263FF0D63F93183AF81B16964F4C8A3AB8A02E836CDFEE2CBE32C3E09EB486' : true,
670-
'A26D92B7715B8596D30E12443B6B7C64F7AC41F4A020FE3FEDE8F52DFB4D9AA6' : true,
671668
'A277B893194AE7687EBBCFA344178B3578AA6228D2B430BBE2FC8D5EAEE43135' : true,
672669
'A278FEDD023B6A1BE29917353E38320B8D8EBED9ADB0F88A8D00434D9B1A0851' : true,
673670
'A2C85895E192F69BFF3BD6CE420B8C84A6FC87B3A999F84701F0230887DD3344' : true,
@@ -874,6 +871,7 @@ const X509ChainWhitelist = {
874871
'DA0D9391992825F7A10312F7E85568086F18DB901838A303E721E58239158EA0' : true,
875872
'DA5110BB1526CBA9E86FBC66B91A8A2880E85440765C9208A1FF4D3DF2E8AD65' : true,
876873
'DA675CC41023A78B1E4B2DB4B5E43B0BB6BAD64327E0A1B70C9350FFDEBABB4B' : true,
874+
'DAA1D178C143A35B8A1F394E17F2551770019947EDDA18E8FAAB45F643C1E443' : true,
877875
'DAA9CED5BA817CED9942DB9CFAD0210505937A9DB2214298E0BEB831BFC8A31B' : true,
878876
'DAF6B7470355545FF9FF41E11016056CBD9537558F503D7F9C049C8ACC446112' : true,
879877
'DBBF2D4498ED91C779C81FED5E96F9B5210CE86EA463712268BCAF098FE2E285' : true,
@@ -926,13 +924,15 @@ const X509ChainWhitelist = {
926924
'E696A05D698717888181DFB7B903B380E42454076BA429EC8AB0FB58206AB166' : true,
927925
'E7D6E1EE5088D460A94D5E16D305D1F575BF0895237E4F79A483538CB12903FC' : true,
928926
'E7EB8B4D5DE598BED2B9C817AB7D42F1EC99F16640B8C673AF2152D42F5344C4' : true,
927+
'E80145830C085D838E07095A18AC3178396F8D552B3D77A6E15B2E48A6C00717' : true,
929928
'E853498E9A3091B0AF8641A0B62970AB613371CA3631D1C97D70F79042BB00D0' : true,
930929
'E855A1B90A017AC7A8C20639AA316048160973669FD0058C9237B5FED85F34B7' : true,
931930
'E8CEBFAFE4D31D8F110DF0D61793BFC32B10492A2840D7DF99922E78000030BF' : true,
932931
'E928047ACF80352DE21C59864D3DD5C34E7325E52821D7D30A0F112677EB660F' : true,
933932
'E98FAFA6B8EE0C53407805C761D80684215776CE5F4085CCAC91B876E92B3307' : true,
934933
'E9C07A0196B2C73344FAFBE8488F0B4E048FC4112B8EEDDDF74F949340255E44' : true,
935934
'E9CFA5E0C69E623B15F54AF73644E6FD5B0F86F24826F378F7C903D50A1AAA28' : true,
935+
'EA028E45F54FEFEE8D14D2E848A20950C7CB1F8532D70D01646A5B93497AC1C5' : true,
936936
'EA7AD4DE86B47BEC726BFE21172676F92E0C0BB86888417916CB3123086E84A1' : true,
937937
'EACDBC29504EE8E44559D3FCF154E1CF632CBBB4065734CB5C6C1B16D42352B5' : true,
938938
'EB479C3872B58B510211798256705A8C59D2602125CF4B53219AA9CCFB175E1F' : true,
@@ -974,6 +974,7 @@ const X509ChainWhitelist = {
974974
'F5EFB0566F96DBFC58848E1F101457F6F2D05904C1F91A4D22B1192787B0FBD1' : true,
975975
'F62CA149D43A56F24345F70DD17EAC3E6232068AD7E06251AEB42ACAE23BA120' : true,
976976
'F6620F848AB3CFC1695D2AF5399FD8FDD8F2FEC43F73F2924DF78C1A26C22653' : true,
977+
'F6719127E9730A196DF5D961354756211240F34C5279D39351C3DBBBB2896244' : true,
977978
'F6D424B2B0304F80F9F57E9A501576769B75304FFB569A1118B9B0D5E72561C6' : true,
978979
'F7835EBD5236BECAB435AE25E9D79BB389DFA8462D552965A2B901ED70B4FF79' : true,
979980
'F805AE1FEDB2D94096F0D341B703ECD4975D773A179555DDC83D424F85578571' : true,
@@ -996,7 +997,6 @@ const X509ChainWhitelist = {
996997
'FE075A2C82D9FA253B59B401A7A31C4AD5D17FD66FE393D8EE5ACD7FA478743D' : true,
997998
'FE2ACBE26A3ACFBA15C9C3425A9A06EED0006E94A82669BFE3BE705D578021D6' : true,
998999
'FEB76D3D961661D830CDE04D78FAD83736F60E3D9473688418FB1DE7AE942663' : true,
999-
'FEC9F5C500456C61F90439F04F3E1B8884AEDF07BD5A35E6DA8A8FC61731F053' : true,
10001000
'FF3E77DFF8C24FE2DC89CE8757B6AE9ACBB838D35AEBDBD9A29D099E211380BB' : true,
10011001
'FF4B63FB97FBFD55B9173F648FA145576AEEB91D0166D79F1A0087A8235538E4' : true,
10021002
'FF8C4E466EBCD5BD1A16F83E6096501479D74D077F84F2EDEA264781DFD82270' : true,

‎src/chrome/content/rules/6xq.net.xml‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
<!--
2-
Disabled by https-everywhere-checker because:
3-
Fetch error: http://6xq.net/ => https://6xq.net/: (60, 'SSL certificate problem: unable to get local issuer certificate')
4-
Fetch error: http://www.6xq.net/ => https://6xq.net/: (60, 'SSL certificate problem: unable to get local issuer certificate')
5-
-->
6-
<ruleset name="6xq.net (CAcert)" platform="cacert" default_off='failed ruleset test'>
2+
Non-functional hosts
3+
SSL peer certificate was not OK:
4+
- ns.6xq.net
75
8-
<target host="6xq.net"/>
9-
<target host="www.6xq.net"/>
6+
-->
7+
<ruleset name="6xq.net">
8+
<target host="6xq.net" />
9+
<target host="www.6xq.net" />
10+
<target host="luna.6xq.net" />
11+
<test url="http://luna.6xq.net/luna.png" />
1012

11-
<!-- cert !match www -->
12-
<rule from="^http://(?:www\.)?6xq\.net/"
13-
to="https://6xq.net/"/>
13+
<securecookie host=".+" name=".+" />
1414

15+
<rule from="^http:" to="https:" />
1516
</ruleset>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
- abcnews.go.com from pixel.quantserve.com
2626
2727
-->
28-
<ruleset name="ABC News (partial)">
28+
<ruleset name="ABC News (partial)" default_off="JS redirect loop">
2929

3030
<!-- Direct rewrites:
3131
-->

0 commit comments

Comments
 (0)