diff --git a/certoperations.js b/certoperations.js index d3ddc782..ac26b42e 100644 --- a/certoperations.js +++ b/certoperations.js @@ -549,7 +549,7 @@ module.exports.CertificateOperations = function (parent) { // Accelerators, used to dispatch work to other processes const fork = require("child_process").fork; const program = require("path").join(__dirname, "meshaccelerator.js"); - const acceleratorTotalCount = 1; //require("os").cpus().length; // TODO: Check if this accelerator can scale. + const acceleratorTotalCount = require("os").cpus().length; // TODO: Check if this accelerator can scale. var acceleratorCreateCount = acceleratorTotalCount; var freeAccelerators = []; var pendingAccelerator = []; diff --git a/mpsserver.js b/mpsserver.js index f5fa14ab..a07f4d78 100644 --- a/mpsserver.js +++ b/mpsserver.js @@ -32,7 +32,8 @@ module.exports.CreateMpsServer = function (parent, db, args, certificates) { if (obj.args.mpstlsoffload) { obj.server = net.createServer(onConnection); } else { - obj.server = tls.createServer({ key: certificates.mps.key, cert: certificates.mps.cert, requestCert: true, rejectUnauthorized: false, ciphers: "HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!SRP:!CAMELLIA", secureOptions: constants.SSL_OP_NO_SSLv2 | constants.SSL_OP_NO_SSLv3 | constants.SSL_OP_NO_COMPRESSION }, onConnection); + // Note that in oder to support older Intel AMT CIRA connections, we have to turn on TLSv1. + obj.server = tls.createServer({ key: certificates.mps.key, cert: certificates.mps.cert, minVersion: 'TLSv1', requestCert: true, rejectUnauthorized: false, ciphers: "HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!SRP:!CAMELLIA", secureOptions: constants.SSL_OP_NO_SSLv2 | constants.SSL_OP_NO_SSLv3 | constants.SSL_OP_NO_COMPRESSION }, onConnection); //obj.server.on('secureConnection', function () { /*console.log('tlsServer secureConnection');*/ }); //obj.server.on('error', function () { console.log('MPS tls server error'); }); obj.server.on('newSession', function (id, data, cb) { if (tlsSessionStoreCount > 1000) { tlsSessionStoreCount = 0; tlsSessionStore = {}; } tlsSessionStore[id.toString('hex')] = data; tlsSessionStoreCount++; cb(); }); diff --git a/package.json b/package.json index eb461130..ffa2996b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "meshcentral", - "version": "0.3.3-o", + "version": "0.3.3-p", "keywords": [ "Remote Management", "Intel AMT",