diff options
| author | Rod Vagg <rod@vagg.org> | 2019-03-01 22:30:36 +1100 |
|---|---|---|
| committer | Rod Vagg <rod@vagg.org> | 2019-03-12 13:10:54 +1100 |
| commit | 0d94c23c49218d8bff9a8086134356e76903c5fb (patch) | |
| tree | 7123857b9f65d466a51c7aec82b938df60295d6d | |
| parent | 2fa8dc47f3f3a548dd78ccb41bf1d082c1628dfb (diff) | |
| download | android-node-v8-0d94c23c49218d8bff9a8086134356e76903c5fb.tar.gz android-node-v8-0d94c23c49218d8bff9a8086134356e76903c5fb.tar.bz2 android-node-v8-0d94c23c49218d8bff9a8086134356e76903c5fb.zip | |
deps,tools: include SipHash in LICENSE
PR-URL: https://github.com/nodejs/node/pull/26367
Refs: https://github.com/nodejs/node/issues/23259
Refs: https://darksi.de/12.hashwick-v8-vulnerability/
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Yang Guo <yangguo@chromium.org>
Reviewed-By: Ujjwal Sharma <usharma1998@gmail.com>
| -rw-r--r-- | LICENSE | 11 | ||||
| -rwxr-xr-x | tools/license-builder.sh | 2 |
2 files changed, 13 insertions, 0 deletions
@@ -774,6 +774,17 @@ The externally maintained libraries used by Node.js are: OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. """ +- SipHash, located at deps/v8/src/third_party/siphash, is licensed as follows: + """ + SipHash reference C implementation + + Copyright (c) 2016 Jean-Philippe Aumasson <jeanphilippe.aumasson@gmail.com> + + To the extent possible under law, the author(s) have dedicated all + copyright and related and neighboring rights to this software to the public + domain worldwide. This software is distributed without any warranty. + """ + - zlib, located at deps/zlib, is licensed as follows: """ zlib.h -- interface of the 'zlib' general purpose compression library diff --git a/tools/license-builder.sh b/tools/license-builder.sh index d0d3d766a6..55f630285e 100755 --- a/tools/license-builder.sh +++ b/tools/license-builder.sh @@ -64,6 +64,8 @@ addlicense "OpenSSL" "deps/openssl" \ addlicense "Punycode.js" "lib/punycode.js" \ "$(curl -sL https://raw.githubusercontent.com/bestiejs/punycode.js/master/LICENSE-MIT.txt)" addlicense "V8" "deps/v8" "$(cat ${rootdir}/deps/v8/LICENSE)" +addlicense "SipHash" "deps/v8/src/third_party/siphash" \ + "$(sed -e '/You should have received a copy of the CC0/,$d' -e 's/^\/\* *//' -e 's/^ \* *//' deps/v8/src/third_party/siphash/halfsiphash.cc)" addlicense "zlib" "deps/zlib" \ "$(sed -e '/The data format used by the zlib library/,$d' -e 's/^\/\* *//' -e 's/^ *//' ${rootdir}/deps/zlib/zlib.h)" |