Update attached undici version and rebase FIPS patch

Resolves: RHEL-43645 RHEL-46706 RHEL-46882 RHEL-50109
This commit is contained in:
Honza Horak 2024-08-07 16:13:21 +02:00
parent 2b5525a082
commit 199601c94d
4 changed files with 10 additions and 9 deletions

1
.gitignore vendored
View File

@ -64,3 +64,4 @@
/icu4c-75_1-src.tgz /icu4c-75_1-src.tgz
/undici-6.13.0.tar.gz /undici-6.13.0.tar.gz
/node-v20.16.0-stripped.tar.gz /node-v20.16.0-stripped.tar.gz
/undici-6.19.2.tar.gz

View File

@ -50,9 +50,8 @@ index 1216f3a..fbfcb26 100644
if (val) return; if (val) return;
throw new ERR_CRYPTO_FIPS_FORCED(); throw new ERR_CRYPTO_FIPS_FORCED();
diff --git a/lib/internal/errors.js b/lib/internal/errors.js diff --git a/lib/internal/errors.js b/lib/internal/errors.js
index def4949..580ca7a 100644 --- a/lib/internal/errors.js.patch0002 2024-08-07 15:29:09.366357433 +0200
--- a/lib/internal/errors.js +++ b/lib/internal/errors.js 2024-08-07 15:29:14.392366591 +0200
+++ b/lib/internal/errors.js
@@ -1112,6 +1112,12 @@ module.exports = { @@ -1112,6 +1112,12 @@ module.exports = {
// //
// Note: Node.js specific errors must begin with the prefix ERR_ // Note: Node.js specific errors must begin with the prefix ERR_
@ -64,8 +63,8 @@ index def4949..580ca7a 100644
+ Error); + Error);
+ +
E('ERR_ACCESS_DENIED', E('ERR_ACCESS_DENIED',
'Access to this API has been restricted. Permission: %s', function(msg, permission = '', resource = '') {
Error); this.permission = permission;
diff --git a/src/crypto/crypto_util.cc b/src/crypto/crypto_util.cc diff --git a/src/crypto/crypto_util.cc b/src/crypto/crypto_util.cc
index 5734d8f..ef9d1b1 100644 index 5734d8f..ef9d1b1 100644
--- a/src/crypto/crypto_util.cc --- a/src/crypto/crypto_util.cc

View File

@ -181,9 +181,10 @@ Source101: cjs-module-lexer-1.2.2.tar.gz
Source102: https://github.com/WebAssembly/wasi-sdk/archive/wasi-sdk-11/wasi-sdk-wasi-sdk-11.tar.gz Source102: https://github.com/WebAssembly/wasi-sdk/archive/wasi-sdk-11/wasi-sdk-wasi-sdk-11.tar.gz
# Version: jq '.version' deps/undici/src/package.json # Version: jq '.version' deps/undici/src/package.json
# Original: https://github.com/nodejs/undici/archive/refs/tags/v5.28.3.tar.gz # Original: https://github.com/nodejs/undici/archive/refs/tags/v6.13.0.tar.gz
# Adjustments: rm -f undici-5.28.4/lib/llhttp/llhttp*.wasm* # Adjustments: rm -f undici-6.13.0/lib/llhttp/llhttp*.wasm
Source111: undici-6.13.0.tar.gz # wasi-sdk version can be found in lib/llhttp/wasm_build_env.txt
Source111: undici-6.19.2.tar.gz
# The WASM blob was made using wasi-sdk v16; compiler libraries are linked in. # The WASM blob was made using wasi-sdk v16; compiler libraries are linked in.
# Version source: deps/undici/src/lib/llhttp/wasm_build_env.txt # Version source: deps/undici/src/lib/llhttp/wasm_build_env.txt
# Also check (undici tarball): lib/llhttp/wasm_build_env.txt # Also check (undici tarball): lib/llhttp/wasm_build_env.txt

View File

@ -1,6 +1,6 @@
SHA512 (node-v20.16.0-stripped.tar.gz) = 93e4b4350f4560c9c3ffe4c5c41dd93dc3dfad33e3c2b7ef864ae987fc51f30dd6d04f087eca2d9fa6848996697059ba64f291f86b6965a39905220de3bff397 SHA512 (node-v20.16.0-stripped.tar.gz) = 93e4b4350f4560c9c3ffe4c5c41dd93dc3dfad33e3c2b7ef864ae987fc51f30dd6d04f087eca2d9fa6848996697059ba64f291f86b6965a39905220de3bff397
SHA512 (icu4c-75_1-src.tgz) = 70ea842f0d5f1f6c6b65696ac71d96848c4873f4d794bebc40fd87af2ad4ef064c61a786bf7bc430ce4713ec6deabb8cc1a8cc0212eab148cee2d498a3683e45 SHA512 (icu4c-75_1-src.tgz) = 70ea842f0d5f1f6c6b65696ac71d96848c4873f4d794bebc40fd87af2ad4ef064c61a786bf7bc430ce4713ec6deabb8cc1a8cc0212eab148cee2d498a3683e45
SHA512 (undici-6.13.0.tar.gz) = e906e7109865f63947f4732be23caaacdb6df8ab3ff6f302dd7870dde672e852754f06a4ce5b0168e076a4344fd8ad5dfd340b6670a1211cb9c54367eb515430 SHA512 (undici-6.19.2.tar.gz) = 71bb841026e366784b3d28e3e15bb497dad4b361f6485599bfaf22ce98f1ce1b483e2f318749282a97ef267e0a3f2759a8dc979f75deed8999407a0a53249159
SHA512 (cjs-module-lexer-1.2.2.tar.gz) = 0437378a087a43044b64e6b2e66426e429d87ed3f24a225d20ddc8fedda25917ba7db04a9d41207c59d20f0e6764837dad09393e5b8f92e361941a60ac5edd80 SHA512 (cjs-module-lexer-1.2.2.tar.gz) = 0437378a087a43044b64e6b2e66426e429d87ed3f24a225d20ddc8fedda25917ba7db04a9d41207c59d20f0e6764837dad09393e5b8f92e361941a60ac5edd80
SHA512 (wasi-sdk-wasi-sdk-11.tar.gz) = cb37f357b09431a3efad26141d83dce63232a35b536d9a7bd341d4d9627a0a3d4bd4d57504b6e3dab421942d2c168a96da2a6be889aab3f9a2852fc5a3200d3c SHA512 (wasi-sdk-wasi-sdk-11.tar.gz) = cb37f357b09431a3efad26141d83dce63232a35b536d9a7bd341d4d9627a0a3d4bd4d57504b6e3dab421942d2c168a96da2a6be889aab3f9a2852fc5a3200d3c
SHA512 (wasi-sdk-wasi-sdk-16.tar.gz) = 501467cb04ee85ab2ccc3d8ab1beb5dd8957ca71cc51c86fd357991ddccb1a8c2656e24b947ea3a5acfaafd8c762f5ba20458c22b58a5a5c85ef8ecb7a76db65 SHA512 (wasi-sdk-wasi-sdk-16.tar.gz) = 501467cb04ee85ab2ccc3d8ab1beb5dd8957ca71cc51c86fd357991ddccb1a8c2656e24b947ea3a5acfaafd8c762f5ba20458c22b58a5a5c85ef8ecb7a76db65