diff options
| author | Yang Guo <yangguo@chromium.org> | 2018-10-04 13:06:00 +0200 |
|---|---|---|
| committer | Michaël Zasso <targos@protonmail.com> | 2018-10-07 12:11:34 +0200 |
| commit | f08373f18dc73a8dd57cf445c53414601efcaf55 (patch) | |
| tree | edd31a932538e49f84323b657530e6577ddae052 /common.gypi | |
| parent | 77de1beaf07d79eb6aeed9f46f3e5d03da49c7d7 (diff) | |
| download | node-new-f08373f18dc73a8dd57cf445c53414601efcaf55.tar.gz | |
deps: cherry-pick 64-bit hash seed commits from V8
This serves as mitigation for the so-called HashWick vulnerability.
Original commit messages:
commit d5686a74d56fbb6985b22663ddadd66eb7b91519
Author: Yang Guo <yangguo@chromium.org>
Date: Mon Jul 16 11:19:42 2018
Extend hash seed to 64 bits
R=bmeurer@chromium.org, ulan@chromium.org
Bug: chromium:680662
Change-Id: I5e1486ad2a42db2998d5485a0c4e711378678e6c
Reviewed-on: https://chromium-review.googlesource.com/1136034
Reviewed-by: Marja Hölttä <marja@chromium.org>
Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
Reviewed-by: Benedikt Meurer <bmeurer@chromium.org>
Commit-Queue: Yang Guo <yangguo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#54460}
commit 3833fef57368c53c6170559ffa524c8c69f16ee5
Author: Yang Guo <yangguo@chromium.org>
Date: Thu Sep 20 11:43:13 2018
Refactor integer hashing function names
We now clearly differentiate between:
- unseeded hash for 32-bit integers
- unseeded hash for 64-bit integers
- seeded hash for 32-bit integers
- seeded hash for strings
R=bmeurer@chromium.org
Bug: chromium:680662
Change-Id: I7459958c4158ee3501c962943dff8f33258bb5ce
Reviewed-on: https://chromium-review.googlesource.com/1235973
Commit-Queue: Yang Guo <yangguo@chromium.org>
Reviewed-by: Benedikt Meurer <bmeurer@chromium.org>
Cr-Commit-Position: refs/heads/master@{#56068}
commit 95a979e02d7154e45b293261a6998c99d71fc238
Author: Yang Guo <yangguo@chromium.org>
Date: Thu Sep 20 14:34:48 2018
Call into C++ to compute seeded integer hash
R=bmeurer@chromium.org
Bug: chromium:680662
Change-Id: I8dace89d576dfcc5833fd539ce698a9ade1cb5a0
Reviewed-on: https://chromium-review.googlesource.com/1235928
Commit-Queue: Yang Guo <yangguo@chromium.org>
Reviewed-by: Benedikt Meurer <bmeurer@chromium.org>
Cr-Commit-Position: refs/heads/master@{#56091}
commit 2c2af0022d5feb9e525a00a76cb15db9f3e38dba
Author: Yang Guo <yangguo@chromium.org>
Date: Thu Sep 27 16:37:57 2018
Use 64-bit for seeded integer hashes
R=petermarshall@chromium.org
Bug: chromium:680662
Change-Id: If48d1043dbe1e1bb695ec890c23e103a6cacf2d4
Reviewed-on: https://chromium-review.googlesource.com/1244220
Commit-Queue: Yang Guo <yangguo@chromium.org>
Reviewed-by: Peter Marshall <petermarshall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#56271}
Refs: https://github.com/nodejs/node/issues/23259
PR-URL: https://github.com/nodejs/node/pull/23260
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com>
Diffstat (limited to 'common.gypi')
| -rw-r--r-- | common.gypi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common.gypi b/common.gypi index 2621b5e327..c06cf7104d 100644 --- a/common.gypi +++ b/common.gypi @@ -25,7 +25,7 @@ 'uv_library%': 'static_library', 'clang%': 0, - + 'openssl_fips%': '', # Default to -O0 for debug builds. @@ -33,7 +33,7 @@ # Reset this number to 0 on major V8 upgrades. # Increment by one for each non-official patch applied to deps/v8. - 'v8_embedder_string': '-node.32', + 'v8_embedder_string': '-node.33', # Enable disassembler for `--print-code` v8 options 'v8_enable_disassembler': 1, |