From b7dd0b841e419c4abc8c8a3c6407a83790800976 Mon Sep 17 00:00:00 2001 From: Rod Vagg Date: Fri, 1 Mar 2019 22:30:36 +1100 Subject: [PATCH] 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 Reviewed-By: Richard Lau Reviewed-By: Refael Ackermann Reviewed-By: Ben Noordhuis Reviewed-By: Ruben Bridgewater Reviewed-By: Fedor Indutny Reviewed-By: James M Snell Reviewed-By: Yang Guo Reviewed-By: Ujjwal Sharma --- LICENSE | 11 +++++++++++ tools/license-builder.sh | 2 ++ 2 files changed, 13 insertions(+) diff --git a/LICENSE b/LICENSE index e1034fff7aa8bb..6dcd8c288ab098 100644 --- a/LICENSE +++ b/LICENSE @@ -748,6 +748,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 + + 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 82addcd0b40731..80d050073dca7f 100755 --- a/tools/license-builder.sh +++ b/tools/license-builder.sh @@ -63,6 +63,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)"