MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-02-10 13:18:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

Corrected getPublicKeyHashBinary() to handle hashing the public key of a cert without ForgeJS.

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2023-10-01 00:52:17 -07:00
parent dd279d3ea2
commit f5c056fdeb
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
certoperations.js
View File

@ -640,12 +640,11 @@ module.exports.CertificateOperations = function (parent) {
const { X509Certificate } = require('crypto'); const { X509Certificate } = require('crypto');
if (X509Certificate == null) { if (X509Certificate == null) {
// This version of NodeJS (<v15.6.0) does not support X509 certs, use Node-Forge instead which only supports RSA certs. // This version of NodeJS (<v15.6.0) does not support X509 certs, use Node-Forge instead which only supports RSA certs.
var publickey = obj.pki.certificateFromPem(pem).publicKey; return obj.pki.getPublicKeyFingerprint(obj.pki.certificateFromPem(pem).publicKey, { encoding: 'binary', md: obj.forge.md.sha384.create() });
return obj.pki.getPublicKeyFingerprint(publickey, { encoding: 'binary', md: obj.forge.md.sha384.create() });
} else { } else {
// This version of NodeJS supports x509 certificates // This version of NodeJS supports x509 certificates
// TODO: THIS IS NOT CORRECT, this is SHA254 of the entire cert. var cert = new X509Certificate(pem);
return Buffer.from(new X509Certificate(pem).fingerprint256.split(':').join(''), 'hex'); return obj.crypto.createHash('sha384').update(cert.publicKey.export({ type: ((cert.publicKey.asymmetricKeyType == 'rsa') ? 'pkcs1' : 'spki'), format: 'der' })).digest('binary');
} }
}; };