morgan pushed to branch tor-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Tor Browser

Commits: 4023a7c6 by Pier Angelo Vendrame at 2024-08-12T16:20:28+00:00 fixup! Bug 40209: Implement Basic Crypto Safety

Bug 43001: Ship only a copy of the MIT license, like upstream.

See MozBug 1838373.

- - - - - b962fd9c by Pier Angelo Vendrame at 2024-08-12T16:20:28+00:00 fixup! Bug 40807: Added QRCode.js to toolkit/modules

Bug 43001: Ship only a copy of the MIT license, like upstream.

See MozBug 1838373.

- - - - -

1 changed file:

- toolkit/content/license.html

Changes:

===================================== toolkit/content/license.html ===================================== @@ -67,7 +67,6 @@ <li><a href="about:license#apple">Apple License</a></li> <li><a href="about:license#apple-password-rules-parser">Apple Password Rules Parser License</a></li> <li><a href="about:license#arm">ARM License</a></li> - <li><a href="about:license#bech32">Bech32 License</a></li> <li><a href="about:license#boost">boost License</a></li> <li><a href="about:license#bsd2clause">BSD 2-Clause License</a></li> <li><a href="about:license#bsd3clause">BSD 3-Clause License</a></li> @@ -134,7 +133,6 @@ <li><a href="about:license#praton1">praton and inet_ntop License</a></li> <li><a href="about:license#qcms">qcms License</a></li> <li><a href="about:license#qrcode-generator">QR Code Generator License</a></li> - <li><a href="about:license#qrcode-js">QRCode.js License</a></li> <li><a href="about:license#react">React License</a></li> <li><a href="about:license#react-redux">React-Redux License</a></li> <li><a href="about:license#xdg">Red Hat xdg_user_dir_lookup License</a></li> @@ -1818,38 +1816,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. </pre>

- - <hr> - - <h1><a id="bech32"></a>Bech32 License</h1> - - <p>This license applies to the file - <code>toolkit/modules/Bech32Decode.sys.mjs</code>. - </p> - -<pre> -Copyright (c) 2017 Pieter Wuille - -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: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -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. -</pre> - - <hr>

<h1><a id="boost"></a>boost License</h1> @@ -3664,6 +3630,8 @@ SOFTWARE. <li><code>js/src/vm/Float16.h</code>(the code contained in the half namespace)</li> <li><code>toolkit/components/resistfingerprinting/content/gl-matrix.js</code></li> <li><code>toolkit/components/resistfingerprinting/content/ssdeep.js</code></li> + <li><code>toolkit/modules/Bech32Decode.sys.mjs</code></li> + <li><code>toolkit/modules/QRCode.sys.mjs</code></li> </ul> See the individual LICENSE files or headers for copyright owners.</p>

@@ -4249,38 +4217,6 @@ furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

-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. -</pre> - - <hr> - - <h1><a id="qrcode-js"></a>QRCode.js License</h1> - - <p>This license applies to the file - <code>toolkit/modules/QRCode.sys.mjs</code>.</p> -<pre> -The MIT License (MIT) ---------------------- -Copyright (c) 2009 Kazuhiko Arase -Copyright (c) 2012 davidshimjs -Copyright (c) 2018 ivan386 - -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: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - 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

View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/f4d44bf...