Merge ~adrien/ubuntu/+source/nodejs:plucky-test-failures-openssl-3.4 into ubuntu/+source/nodejs:ubuntu/devel

[Adrien Nader]

Please review this merge request.

# 📊 PPA
A PPA is available at:
 https://launchpad.net/~adrien/+archive/ubuntu/plucky-openssl-merge-3.4

# 🧪 Autopkgtest results
- ✅ nodejs on plucky for amd64 @ 18.12.24 14:38:33
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-adrien-plucky-openssl-merge-3.4/plucky/amd64/n/nodejs/20241218_143833_df8c5@/log.gz
- ❌ nodejs on plucky for arm64 @ 18.12.24 14:55:29
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-adrien-plucky-openssl-merge-3.4/plucky/arm64/n/nodejs/20241218_145529_bee57@/log.gz
      • Status: FAIL
      • command1 FAIL 🟥
- ✅ nodejs on plucky for armhf @ 18.12.24 15:20:30
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-adrien-plucky-openssl-merge-3.4/plucky/armhf/n/nodejs/20241218_152030_e77e5@/log.gz
- ❌ nodejs on plucky for i386 @ 18.12.24 14:28:43
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-adrien-plucky-openssl-merge-3.4/plucky/i386/n/nodejs/20241218_142843_809ae@/log.gz
      • Status: FAIL
      • command1 FAIL 🟥
- ❌ nodejs on plucky for s390x @ 18.12.24 14:44:46
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-adrien-plucky-openssl-merge-3.4/plucky/s390x/n/nodejs/20241218_144446_82d2e@/log.gz
      • Status: FAIL
      • command1 FAIL 🟥

Tests already fail on i386 and s390x so these failure won't have an
impact.

As for arm64, I've seen the error occur in tests unrelated to openssl
3.4 and I suspect it might have recently gotten flacky on s390x (note
that it's the same failure as on s390x so it may be interesting by
itself but it's best handled separately).

# 🔍 Lintian diff from most recent published package
No relevant lintian change

diff --git a/debian/changelog b/debian/changelog
index bdbd16b..c7437bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+nodejs (20.18.1+dfsg-1ubuntu1) plucky; urgency=medium
+
+  * build/test_make_test-crypto-hash_compatible_with_OpenSSL_3.4.0.patch:
+      Skip shake128/shake256 tests that use outputLength: 0 with openssl 3.4
+  * test-skip-sha128-256-createHash-hash-on-openssl-3.4.patch:
+      Skip tests createHash() = hash() for shake128/shake256 on openssl 3.4
+  * test-openssl-3.4-returns-decrypt_error-upon-PSK-bind.patch:
+      Follow openssl 3.4 fixing a TLS 1.3 error code
+
+ -- Adrien Nader <[e-mail]>  Wed, 18 Dec 2024 10:52:41 +0100
+
 nodejs (20.18.1+dfsg-1) unstable; urgency=medium
 
   * New upstream version 20.18.1+dfsg
diff --git a/debian/control b/debian/control
index adfd668..ac1d6b0 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: nodejs
 Section: javascript
 Priority: optional
-Maintainer: Debian Javascript Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Javascript Maintainers <[e-mail]>
 Uploaders: Jérémy Lal <[e-mail]>,
  Jonas Smedegaard <[e-mail]>
 Build-Depends:
diff --git a/debian/patches/build/test-openssl-3.4-returns-decrypt_error-upon-PSK-bind.patch b/debian/patches/build/test-openssl-3.4-returns-decrypt_error-upon-PSK-bind.patch
new file mode 100644
index 0000000..9760383
--- /dev/null
+++ b/debian/patches/build/test-openssl-3.4-returns-decrypt_error-upon-PSK-bind.patch
@@ -0,0 +1,41 @@
+From cc182417a12cfa72747f2f78b3a378dd60191691 Mon Sep 17 00:00:00 2001
+From: Adrien Nader <[e-mail]>
+Date: Tue, 17 Dec 2024 17:29:38 +0100
+Subject: [PATCH 2/2] test: openssl 3.4 returns decrypt_error upon PSK binder
+ validation failure
+
+According to RFC 8446 (TLS 1.3), a PSK binder validation failure should
+result in decrypt_error rather than illegal_parameter which openssl had
+been using. Update the tests to match openssl's fix.
+
+Refs: https://github.com/openssl/openssl/commit/02b8b7b83698d1c7ddfef274f16c039c8cca7988
+Refs: https://www.rfc-editor.org/rfc/rfc8446
+
+Forwarded: https://github.com/nodejs/node/pull/56294
+Bug: https://github.com/nodejs/node/pull/56294
+
+---
+ test/parallel/test-tls-psk-circuit.js | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/test/parallel/test-tls-psk-circuit.js b/test/parallel/test-tls-psk-circuit.js
+index e93db3eb1b..690628758f 100644
+--- a/test/parallel/test-tls-psk-circuit.js
++++ b/test/parallel/test-tls-psk-circuit.js
+@@ -66,7 +66,11 @@ const expectedHandshakeErr = common.hasOpenSSL(3, 2) ?
+   'ERR_SSL_SSL/TLS_ALERT_HANDSHAKE_FAILURE' : 'ERR_SSL_SSLV3_ALERT_HANDSHAKE_FAILURE';
+ test({ psk: USERS.UserB, identity: 'UserC' }, {}, expectedHandshakeErr);
+ // Recognized user but incorrect secret should fail handshake
+-const expectedIllegalParameterErr = common.hasOpenSSL32 ?
+-  'ERR_SSL_SSL/TLS_ALERT_ILLEGAL_PARAMETER' : 'ERR_SSL_SSLV3_ALERT_ILLEGAL_PARAMETER';
++const expectedIllegalParameterErr =
++  common.hasOpenSSL(3, 4)
++  ? 'ERR_SSL_TLSV1_ALERT_DECRYPT_ERROR'
++  : (common.hasOpenSSL(3, 2)
++    ? 'ERR_SSL_SSL/TLS_ALERT_ILLEGAL_PARAMETER'
++    : 'ERR_SSL_SSLV3_ALERT_ILLEGAL_PARAMETER');
+ test({ psk: USERS.UserA, identity: 'UserB' }, {}, expectedIllegalParameterErr);
+ test({ psk: USERS.UserB, identity: 'UserB' });
+-- 
+2.45.2
+
diff --git a/debian/patches/build/test-skip-sha128-256-createHash-hash-on-openssl-3.4.patch b/debian/patches/build/test-skip-sha128-256-createHash-hash-on-openssl-3.4.patch
new file mode 100644
index 0000000..a689852
--- /dev/null
+++ b/debian/patches/build/test-skip-sha128-256-createHash-hash-on-openssl-3.4.patch
@@ -0,0 +1,55 @@
+From 6372fca9467c39522f40c748ee136fe5d7fb3697 Mon Sep 17 00:00:00 2001
+From: Adrien Nader <[e-mail]>
+Date: Tue, 17 Dec 2024 17:18:14 +0100
+Subject: [PATCH 1/2] test: skip sha128/256 createHash()/hash() on openssl 3.4.
+
+OpenSSL 3.4 has intentionally broken EVP_DigestFinal for SHAKE128 and
+SHAKE256 when OSSL_DIGEST_PARAM_XOFLEN is not set because a) the default
+length used weakened them from their maximum strength and b) a static
+length does not fully make sense for XOFs (which SHAKE* are).
+
+Unfortunately, while crypto.createHash accepts an option argument that can
+be something like `{ outputLength: 128 }`, crypto.hash doesn't offer a
+similar API. Therefore there is little choice but to skip the test
+completely for shake128 and shake256 on openssl >= 3.4.
+
+Fixes: https://github.com/nodejs/node/issues/56159
+Refs: https://github.com/openssl/openssl/commit/b911fef216d1386210ec24e201d54d709528abb4
+Refs: https://github.com/openssl/openssl/commit/ad3f28c5fbd5dcbc763a650313fd666b0e339cca
+
+Forwarded: https://github.com/nodejs/node/pull/56294
+Bug: https://github.com/nodejs/node/pull/56294
+
+---
+ test/parallel/test-crypto-oneshot-hash.js | 16 +++++++++-------
+ 1 file changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/test/parallel/test-crypto-oneshot-hash.js b/test/parallel/test-crypto-oneshot-hash.js
+index 56b4c04a65..ba8db85635 100644
+--- a/test/parallel/test-crypto-oneshot-hash.js
++++ b/test/parallel/test-crypto-oneshot-hash.js
+@@ -32,12 +32,14 @@ const input = fs.readFileSync(fixtures.path('utf8_test_text.txt'));
+ 
+ for (const method of methods) {
+   for (const outputEncoding of ['buffer', 'hex', 'base64', undefined]) {
+-    const oldDigest = crypto.createHash(method).update(input).digest(outputEncoding || 'hex');
+-    const digestFromBuffer = crypto.hash(method, input, outputEncoding);
+-    assert.deepStrictEqual(digestFromBuffer, oldDigest,
+-                           `different result from ${method} with encoding ${outputEncoding}`);
+-    const digestFromString = crypto.hash(method, input.toString(), outputEncoding);
+-    assert.deepStrictEqual(digestFromString, oldDigest,
+-                           `different result from ${method} with encoding ${outputEncoding}`);
++    if (method !== 'shake128' && method !== 'shake256' || !common.hasOpenSSL(3, 4)) {
++      const oldDigest = crypto.createHash(method).update(input).digest(outputEncoding || 'hex');
++      const digestFromBuffer = crypto.hash(method, input, outputEncoding);
++      assert.deepStrictEqual(digestFromBuffer, oldDigest,
++                             `different result from ${method} with encoding ${outputEncoding}`);
++      const digestFromString = crypto.hash(method, input.toString(), outputEncoding);
++      assert.deepStrictEqual(digestFromString, oldDigest,
++                             `different result from ${method} with encoding ${outputEncoding}`);
++    }
+   }
+ }
+-- 
+2.45.2
+
diff --git a/debian/patches/build/test_make_test-crypto-hash_compatible_with_OpenSSL_3.4.0.patch b/debian/patches/build/test_make_test-crypto-hash_compatible_with_OpenSSL_3.4.0.patch
new file mode 100644
index 0000000..996e59f
--- /dev/null
+++ b/debian/patches/build/test_make_test-crypto-hash_compatible_with_OpenSSL_3.4.0.patch
@@ -0,0 +1,80 @@
+From 93eabf6a91d30e7bb852d20ade1e5b542dee6b35 Mon Sep 17 00:00:00 2001
+From: Jelle van der Waa <[e-mail]>
+Date: Fri, 6 Dec 2024 18:24:41 +0100
+Subject: [PATCH] test: make test-crypto-hash compatible with OpenSSL > 3.4.0
+
+OpenSSL 3.4 has a breaking change where the outputLength is now
+mandatory for shake* hash algorithms.
+
+Forwarded: https://github.com/nodejs/node/pull/56160/
+Bug: https://github.com/nodejs/node/pull/56160/
+
+---
+ test/common/index.js              |  4 ++++
+ test/parallel/test-crypto-hash.js | 29 ++++++++++++++++-------------
+ 2 files changed, 20 insertions(+), 13 deletions(-)
+
+https://github.com/nodejs/node/pull/56160
+
+diff --git a/test/common/index.js b/test/common/index.js
+index 50595945b193f4..df5784068e0566 100644
+--- a/test/common/index.js
++++ b/test/common/index.js
+@@ -1059,6 +1059,10 @@ const common = {
+     return hasOpenSSL(3, 2);
+   },
+ 
++  get hasOpenSSL34() {
++    return hasOpenSSL(3, 4);
++  },
++
+   get inFreeBSDJail() {
+     if (inFreeBSDJail !== null) return inFreeBSDJail;
+ 
+diff --git a/test/parallel/test-crypto-hash.js b/test/parallel/test-crypto-hash.js
+index 83218c105a4596..a386de866f7120 100644
+--- a/test/parallel/test-crypto-hash.js
++++ b/test/parallel/test-crypto-hash.js
+@@ -7,6 +7,7 @@ const assert = require('assert');
+ const crypto = require('crypto');
+ const fs = require('fs');
+ 
++const { hasOpenSSL34 } = common;
+ const fixtures = require('../common/fixtures');
+ 
+ let cryptoType;
+@@ -182,19 +183,21 @@ assert.throws(
+ 
+ // Test XOF hash functions and the outputLength option.
+ {
+-  // Default outputLengths.
+-  assert.strictEqual(crypto.createHash('shake128').digest('hex'),
+-                     '7f9c2ba4e88f827d616045507605853e');
+-  assert.strictEqual(crypto.createHash('shake128', null).digest('hex'),
+-                     '7f9c2ba4e88f827d616045507605853e');
+-  assert.strictEqual(crypto.createHash('shake256').digest('hex'),
+-                     '46b9dd2b0ba88d13233b3feb743eeb24' +
+-                     '3fcd52ea62b81b82b50c27646ed5762f');
+-  assert.strictEqual(crypto.createHash('shake256', { outputLength: 0 })
+-                           .copy()  // Default outputLength.
+-                           .digest('hex'),
+-                     '46b9dd2b0ba88d13233b3feb743eeb24' +
+-                     '3fcd52ea62b81b82b50c27646ed5762f');
++  // Default outputLengths. Since OpenSSL 3.4 an outputLength is mandatory
++  if (!hasOpenSSL34) {
++    assert.strictEqual(crypto.createHash('shake128').digest('hex'),
++                       '7f9c2ba4e88f827d616045507605853e');
++    assert.strictEqual(crypto.createHash('shake128', null).digest('hex'),
++                       '7f9c2ba4e88f827d616045507605853e');
++    assert.strictEqual(crypto.createHash('shake256').digest('hex'),
++                       '46b9dd2b0ba88d13233b3feb743eeb24' +
++                       '3fcd52ea62b81b82b50c27646ed5762f');
++    assert.strictEqual(crypto.createHash('shake256', { outputLength: 0 })
++                             .copy()  // Default outputLength.
++                             .digest('hex'),
++                       '46b9dd2b0ba88d13233b3feb743eeb24' +
++                       '3fcd52ea62b81b82b50c27646ed5762f');
++  }
+ 
+   // Short outputLengths.
+   assert.strictEqual(crypto.createHash('shake128', { outputLength: 0 })
diff --git a/debian/patches/series b/debian/patches/series
index e35a79f..c90f6bd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,3 +22,6 @@ build/ada.patch
 loong64/tests.patch
 deps/v8-no-static-zlib.patch
 build/no-deps.patch
+build/test_make_test-crypto-hash_compatible_with_OpenSSL_3.4.0.patch
+build/test-skip-sha128-256-createHash-hash-on-openssl-3.4.patch
+build/test-openssl-3.4-returns-decrypt_error-upon-PSK-bind.patch