MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2024-12-24 22:25:52 -05:00
Code Issues Packages Projects Releases Wiki Activity

Replaced unsupported randomint()

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2020-09-23 00:18:17 -07:00
parent cdec7a41e3
commit 08e075b4b3
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
certoperations.js
View File

@ -307,7 +307,7 @@ module.exports.CertificateOperations = function (parent) {
var keys = obj.pki.rsa.generateKeyPair({ bits: (strong == true) ? 3072 : 2048, e: 0x10001 }); var keys = obj.pki.rsa.generateKeyPair({ bits: (strong == true) ? 3072 : 2048, e: 0x10001 });
var cert = obj.pki.createCertificate(); var cert = obj.pki.createCertificate();
cert.publicKey = keys.publicKey; cert.publicKey = keys.publicKey;
cert.serialNumber = require('crypto').randomInt(1, 100000); cert.serialNumber = require('crypto').randomBytes(4).readUInt32BE(0);
cert.validity.notBefore = new Date(2018, 0, 1); cert.validity.notBefore = new Date(2018, 0, 1);
cert.validity.notAfter = new Date(2049, 11, 31); cert.validity.notAfter = new Date(2049, 11, 31);
if (addThumbPrintToName === true) { commonName += '-' + obj.pki.getPublicKeyFingerprint(cert.publicKey, { encoding: 'hex' }).substring(0, 6); } if (addThumbPrintToName === true) { commonName += '-' + obj.pki.getPublicKeyFingerprint(cert.publicKey, { encoding: 'hex' }).substring(0, 6); }
@ -329,7 +329,7 @@ module.exports.CertificateOperations = function (parent) {
var keys = obj.pki.rsa.generateKeyPair({ bits: (strong == true) ? 3072 : 2048, e: 0x10001 }); var keys = obj.pki.rsa.generateKeyPair({ bits: (strong == true) ? 3072 : 2048, e: 0x10001 });
var cert = obj.pki.createCertificate(); var cert = obj.pki.createCertificate();
cert.publicKey = keys.publicKey; cert.publicKey = keys.publicKey;
cert.serialNumber = require('crypto').randomInt(1, 100000); cert.serialNumber = require('crypto').randomBytes(4).readUInt32BE(0);
cert.validity.notBefore = new Date(2018, 0, 1); cert.validity.notBefore = new Date(2018, 0, 1);
cert.validity.notAfter = new Date(2049, 11, 31); cert.validity.notAfter = new Date(2049, 11, 31);
if (addThumbPrintToName === true) { commonName += "-" + obj.pki.getPublicKeyFingerprint(cert.publicKey, { encoding: 'hex' }).substring(0, 6); } if (addThumbPrintToName === true) { commonName += "-" + obj.pki.getPublicKeyFingerprint(cert.publicKey, { encoding: 'hex' }).substring(0, 6); }

2
common.js
View File

@ -96,7 +96,7 @@ module.exports.data2blob = function (data) {
}; };
// Generate random numbers // Generate random numbers
module.exports.random = function (max) { require('crypto').randomInt(0, max); }; module.exports.random = function (max) { (require('crypto').randomBytes(4).readUInt32BE(0) % max); };
// Split a comma seperated string, ignoring commas in quotes. // Split a comma seperated string, ignoring commas in quotes.
module.exports.quoteSplit = function (str) { module.exports.quoteSplit = function (str) {

2
multiserver.js
View File

@ -172,7 +172,7 @@ module.exports.CreateMultiServer = function (parent, args) {
// Get the next retry time in milliseconds // Get the next retry time in milliseconds
function getConnectRetryTime() { function getConnectRetryTime() {
if (obj.retryBackoff < 30000) { obj.retryBackoff += require('crypto').randomInt(1000, 4000); } if (obj.retryBackoff < 30000) { obj.retryBackoff += ((require('crypto').randomBytes(4).readUInt32BE(0) % 3000) + 1000); }
return obj.retryBackoff; return obj.retryBackoff;
} }