[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser][tor-browser-128.1.0esr-14.0-1] 2 commits: fixup! Bug 40209: Implement Basic Crypto Safety

Title: GitLab

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:

Changes:

  • toolkit/content/license.html
    ... ... @@ -67,7 +67,6 @@
    67 67 
           <li><a href="">"about:license#apple">Apple License</a></li>
    68 68 
           <li><a href="">"about:license#apple-password-rules-parser">Apple Password Rules Parser License</a></li>
    69 69 
           <li><a href="">"about:license#arm">ARM License</a></li>
    70 
    -      <li><a href="">"about:license#bech32">Bech32 License</a></li>
    71 70 
           <li><a href="">"about:license#boost">boost License</a></li>
    72 71 
           <li><a href="">"about:license#bsd2clause">BSD 2-Clause License</a></li>
    73 72 
           <li><a href="">"about:license#bsd3clause">BSD 3-Clause License</a></li>
    ... ... @@ -134,7 +133,6 @@
    134 133 
           <li><a href="">"about:license#praton1">praton and inet_ntop License</a></li>
    135 134 
           <li><a href="">"about:license#qcms">qcms License</a></li>
    136 135 
           <li><a href="">"about:license#qrcode-generator">QR Code Generator License</a></li>
    137 
    -      <li><a href="">"about:license#qrcode-js">QRCode.js License</a></li>
    138 136 
           <li><a href="">"about:license#react">React License</a></li>
    139 137 
           <li><a href="">"about:license#react-redux">React-Redux License</a></li>
    140 138 
           <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
    1818 1816 
     THE SOFTWARE.
    1819 1817 
     </pre>
    1820 1818
    1821 
    -
    1822 
    -    <hr>
    1823 
    -
    1824 
    -    <h1><a id="bech32"></a>Bech32 License</h1>
    1825 
    -
    1826 
    -    <p>This license applies to the file
    1827 
    -      <code>toolkit/modules/Bech32Decode.sys.mjs</code>.
    1828 
    -    </p>
    1829 
    -
    1830 
    -<pre>
    1831 
    -Copyright (c) 2017 Pieter Wuille
    1832 
    -
    1833 
    -Permission is hereby granted, free of charge, to any person obtaining a copy
    1834 
    -of this software and associated documentation files (the "Software"), to deal
    1835 
    -in the Software without restriction, including without limitation the rights
    1836 
    -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
    1837 
    -copies of the Software, and to permit persons to whom the Software is
    1838 
    -furnished to do so, subject to the following conditions:
    1839 
    -
    1840 
    -The above copyright notice and this permission notice shall be included in
    1841 
    -all copies or substantial portions of the Software.
    1842 
    -
    1843 
    -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    1844 
    -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    1845 
    -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
    1846 
    -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    1847 
    -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
    1848 
    -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
    1849 
    -THE SOFTWARE.
    1850 
    -</pre>
    1851 
    -
    1852 
    -
    1853 1819 
         <hr>
    1854 1820
    1855 1821 
         <h1><a id="boost"></a>boost License</h1>
    ... ... @@ -3664,6 +3630,8 @@ SOFTWARE.
    3664 3630 
             <li><code>js/src/vm/Float16.h</code>(the code contained in the half namespace)</li>
    3665 3631 
             <li><code>toolkit/components/resistfingerprinting/content/gl-matrix.js</code></li>
    3666 3632 
             <li><code>toolkit/components/resistfingerprinting/content/ssdeep.js</code></li>
    3633 
    +        <li><code>toolkit/modules/Bech32Decode.sys.mjs</code></li>
    3634 
    +        <li><code>toolkit/modules/QRCode.sys.mjs</code></li>
    3667 3635 
         </ul>
    3668 3636 
         See the individual LICENSE files or headers for copyright owners.</p>
    3669 3637
    ... ... @@ -4249,38 +4217,6 @@ furnished to do so, subject to the following conditions:
    4249 4217 
     The above copyright notice and this permission notice shall be included in
    4250 4218 
     all copies or substantial portions of the Software.
    4251 4219
    4252 
    -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    4253 
    -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    4254 
    -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
    4255 
    -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    4256 
    -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
    4257 
    -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
    4258 
    -THE SOFTWARE.
    4259 
    -</pre>
    4260 
    -
    4261 
    -    <hr>
    4262 
    -
    4263 
    -    <h1><a id="qrcode-js"></a>QRCode.js License</h1>
    4264 
    -
    4265 
    -    <p>This license applies to the file
    4266 
    -      <code>toolkit/modules/QRCode.sys.mjs</code>.</p>
    4267 
    -<pre>
    4268 
    -The MIT License (MIT)
    4269 
    ----------------------
    4270 
    -Copyright (c) 2009 Kazuhiko Arase
    4271 
    -Copyright (c) 2012 davidshimjs
    4272 
    -Copyright (c) 2018 ivan386
    4273 
    -
    4274 
    -Permission is hereby granted, free of charge, to any person obtaining a copy
    4275 
    -of this software and associated documentation files (the "Software"), to deal
    4276 
    -in the Software without restriction, including without limitation the rights
    4277 
    -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
    4278 
    -copies of the Software, and to permit persons to whom the Software is
    4279 
    -furnished to do so, subject to the following conditions:
    4280 
    -
    4281 
    -The above copyright notice and this permission notice shall be included in
    4282 
    -all copies or substantial portions of the Software.
    4283 
    -
    4284 4220 
     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    4285 4221 
     IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    4286 4222 
     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help 

    _______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits