suzanne.soy/fork-openpgpjs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support Node.js 18 (#1542)

Browse Source 
Recent Node.js seems to have dropped support for ripemd160.
Thus, properly check the availability of hashes before using them.

Also, add Node.js 18 to CI.
This commit is contained in:
Daniel Huigens 2022-06-29 20:59:38 +02:00 committed by GitHub
parent e69d8b24fc
commit 04e806e0b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/node.js.yml vendored
View File

@ -17,7 +17,7 @@ jobs:
strategy: strategy:
matrix: matrix:
node-version: [12.x, 14.x, 16.x] node-version: [12.x, 14.x, 16.x, 18.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/ # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
steps: steps:

35
src/crypto/hash/index.js
View File

@ -20,8 +20,12 @@ import enums from '../../enums';
const webCrypto = util.getWebCrypto(); const webCrypto = util.getWebCrypto();
const nodeCrypto = util.getNodeCrypto(); const nodeCrypto = util.getNodeCrypto();
const nodeCryptoHashes = nodeCrypto && nodeCrypto.getHashes();
function nodeHash(type) { function nodeHash(type) {
if (!nodeCrypto || !nodeCryptoHashes.includes(type)) {
return;
}
return async function (data) { return async function (data) {
const shasum = nodeCrypto.createHash(type); const shasum = nodeCrypto.createHash(type);
return stream.transform(data, value => { return stream.transform(data, value => {
@ -63,28 +67,15 @@ function asmcryptoHash(hash, webCryptoHash) {
}; };
} }
let hashFunctions; const hashFunctions = {
if (nodeCrypto) { // Use Node native crypto for all hash functions md5: nodeHash('md5') || md5,
hashFunctions = { sha1: nodeHash('sha1') || asmcryptoHash(Sha1, 'SHA-1'),
md5: nodeHash('md5'), sha224: nodeHash('sha224') || hashjsHash(sha224),
sha1: nodeHash('sha1'), sha256: nodeHash('sha256') || asmcryptoHash(Sha256, 'SHA-256'),
sha224: nodeHash('sha224'), sha384: nodeHash('sha384') || hashjsHash(sha384, 'SHA-384'),
sha256: nodeHash('sha256'), sha512: nodeHash('sha512') || hashjsHash(sha512, 'SHA-512'), // asmcrypto sha512 is huge.
sha384: nodeHash('sha384'), ripemd: nodeHash('ripemd160') || hashjsHash(ripemd160)
sha512: nodeHash('sha512'), };
ripemd: nodeHash('ripemd160')
};
} else { // Use JS fallbacks
hashFunctions = {
md5: md5,
sha1: asmcryptoHash(Sha1, 'SHA-1'),
sha224: hashjsHash(sha224),
sha256: asmcryptoHash(Sha256, 'SHA-256'),
sha384: hashjsHash(sha384, 'SHA-384'),
sha512: hashjsHash(sha512, 'SHA-512'), // asmcrypto sha512 is huge.
ripemd: hashjsHash(ripemd160)
};
}
export default { export default {