Skip to content

Commit a4875c7

Browse files
Merge branch 'main' into fix-fs-mkdtemp-buffer
2 parents f06208f + 26079c0 commit a4875c7

230 files changed

Lines changed: 123413 additions & 239 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

SECURITY.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,16 @@ then untrusted input must not lead to arbitrary JavaScript code execution.
212212
* The developers and infrastructure that run it.
213213
* The operating system that Node.js is running under and its configuration,
214214
along with anything under the control of the operating system.
215+
* The deployment network environment for the privacy of traffic and routing
216+
decisions, including internal networks through which Node.js traffic passes
217+
and configured HTTP(S) proxy servers. Built-in proxy support is intended to
218+
route traffic through proxies authorized for the deployment, often because a
219+
firewall requires one to access external networks. It is not intended to hide
220+
traffic from network operators or authorities governing the deployment.
221+
Untrusted or unauthorized proxies, as well as deployment policy or legal
222+
compliance controls around proxy use, are the responsibility of the deployment
223+
operator and are outside this threat model. This does not change that data
224+
parsed from network protocol peers is untrusted as described above.
215225
* The code it is asked to run, including JavaScript, WASM and native code, even
216226
if said code is dynamically loaded, e.g., all dependencies installed from the
217227
npm registry or libraries loaded via `node:ffi`.

deps/openssl/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ Here is a list of supported architectures for use of ASM in OpenSSL.
5454
| linux | ppc64(*1) | linux-ppc64le | o |
5555
| linux | s390 | linux32-s390x | o |
5656
| linux | s390x | linux64-s390x | o |
57+
| linux | riscv64 | linux64-riscv64 | - |
5758
| mac | ia32 | darwin-i386-cc | - |
5859
| mac | x64 | darwin64-x86-cc | o |
5960
| win | ia32 | VC-WIN32 | - |

deps/openssl/config/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@ ASM_ARCHS = aix64-gcc-as BSD-x86 BSD-x86_64 \
1313
darwin64-x86_64-cc darwin-i386-cc darwin64-arm64-cc linux-aarch64 \
1414
linux-armv4 linux-elf linux-x86_64 \
1515
linux-ppc64le linux32-s390x linux64-s390x linux64-mips64\
16+
linux64-riscv64 \
1617
solaris-x86-gcc solaris64-x86_64-gcc VC-WIN64A VC-WIN32
1718

18-
NO_ASM_ARCHS = VC-WIN64-ARM linux64-riscv64 linux64-loongarch64
19+
NO_ASM_ARCHS = VC-WIN64-ARM linux64-loongarch64
1920

2021
CC = gcc
2122
FAKE_GCC = ../config/fake_gcc.pl

0 commit comments

Comments
 (0)