diff options
| author | Rod Vagg <rod@vagg.org> | 2019-03-01 11:22:06 +1100 |
|---|---|---|
| committer | Rod Vagg <rod@vagg.org> | 2019-03-12 13:10:52 +1100 |
| commit | 2fa8dc47f3f3a548dd78ccb41bf1d082c1628dfb (patch) | |
| tree | 6723d381e1ee34c87fc7c51f2ceb6c534862142f /deps | |
| parent | e1cd8ac00760eaf62ee9d51b872a6602d3e932ef (diff) | |
| download | android-node-v8-2fa8dc47f3f3a548dd78ccb41bf1d082c1628dfb.tar.gz android-node-v8-2fa8dc47f3f3a548dd78ccb41bf1d082c1628dfb.tar.bz2 android-node-v8-2fa8dc47f3f3a548dd78ccb41bf1d082c1628dfb.zip | |
build: enable v8's siphash for hash seed creation
Triggers the V8_USE_SIPHASH to switch from the internal custom V8
hash seed generation function to an implementation of SipHash. Final
step needed to clear up HashWick.
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>
Diffstat (limited to 'deps')
| -rw-r--r-- | deps/v8/gypfiles/features.gypi | 3 | ||||
| -rw-r--r-- | deps/v8/gypfiles/v8.gyp | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/deps/v8/gypfiles/features.gypi b/deps/v8/gypfiles/features.gypi index 7e5af8883a..28ae99dac8 100644 --- a/deps/v8/gypfiles/features.gypi +++ b/deps/v8/gypfiles/features.gypi @@ -178,6 +178,9 @@ ['v8_use_snapshot=="true" and v8_use_external_startup_data==1', { 'defines': ['V8_USE_EXTERNAL_STARTUP_DATA',], }], + ['v8_use_siphash=="true"', { + 'defines': ['V8_USE_SIPHASH',], + }], ['dcheck_always_on!=0', { 'defines': ['DEBUG',], }], diff --git a/deps/v8/gypfiles/v8.gyp b/deps/v8/gypfiles/v8.gyp index 857ff0ecec..7acd2ac941 100644 --- a/deps/v8/gypfiles/v8.gyp +++ b/deps/v8/gypfiles/v8.gyp @@ -130,6 +130,7 @@ 'v8_enable_verify_predictable=<(v8_enable_verify_predictable)', 'v8_target_cpu=<(v8_target_arch)', 'v8_use_snapshot=<(v8_use_snapshot)', + 'v8_use_siphash=<(v8_use_siphash)', ] }, 'conditions': [ @@ -1528,6 +1529,8 @@ '../src/string-stream.h', '../src/strtod.cc', '../src/strtod.h', + '../src/third_party/siphash/halfsiphash.cc', + '../src/third_party/siphash/halfsiphash.h', '../src/third_party/utf8-decoder/utf8-decoder.h', '../src/torque-assembler.h', '../src/tracing/trace-event.cc', |