MeshCMD fixes.

Ylian Saint-Hilaire committed Jun 27, 2019 at 16:14 UTC a8f69cdf8fdaf7ebfeca77045d246f7a80d266ef
4 files changed +10 -6
agents/MeshCmd-signed.exe
Binary files a/agents/MeshCmd-signed.exe and b/agents/MeshCmd-signed.exe differ
agents/MeshCmd64-signed.exe
Binary files a/agents/MeshCmd64-signed.exe and b/agents/MeshCmd64-signed.exe differ
agents/meshcmd.js
+5 -3
@@ -982,6 +982,8 @@ function activeToACMEx(fwNonce, dnsSuffix, digestRealm, uuid, allowedModes) {
982 if (typeof cmd.password != 'string') { console.log('Invalid server password'); exit(100); return; }
983 if (typeof cmd.nonce != 'string') { console.log('Invalid server nonce'); exit(100); return; }
984 if (typeof cmd.certs != 'object') { console.log('Invalid server certificates'); exit(100); return; }
985 + settings.xxprofileScript = cmd.profileScript;
986 + settings.xxrawpassword = cmd.rawpassword;
987
988 cmd.index = 0;
989 // If we are in CCM mode, deactivate.
@@ -1078,10 +1080,10 @@ function AcmActivationCompleted(result) {
1080 settings.xxsocket.end();
1081 exit(1);
1082 } else {
1081 - if ((cmd.profileScript !== null) && (cmd.rawpassword != null)) {
1083 + if ((settings.xxprofileScript !== null) && (settings.xxrawpassword != null)) {
1084 console.log('Intel AMT ACM activation success, applying profile...');
1083 - settings.scriptjson = cmd.profileScript;
1084 - settings.password = cmd.rawpassword; // This is only going to work if the server sends the raw password
1085 + settings.scriptjson = settings.xxprofileScript;
1086 + settings.password = settings.xxrawpassword; // This is only going to work if the server sends the raw password
1087 settings.username = 'admin';
1088 startMeScriptEx(function () { console.log('Intel AMT profile applied.'); settings.xxsocket.end(); exit(0); }, stack);
1089 } else {
agents/meshcmd.min.js
+5 -3
@@ -982,6 +982,8 @@ function activeToACMEx(fwNonce, dnsSuffix, digestRealm, uuid, allowedModes) {
982 if (typeof cmd.password != 'string') { console.log('Invalid server password'); exit(100); return; }
983 if (typeof cmd.nonce != 'string') { console.log('Invalid server nonce'); exit(100); return; }
984 if (typeof cmd.certs != 'object') { console.log('Invalid server certificates'); exit(100); return; }
985 + settings.xxprofileScript = cmd.profileScript;
986 + settings.xxrawpassword = cmd.rawpassword;
987
988 cmd.index = 0;
989 // If we are in CCM mode, deactivate.
@@ -1078,10 +1080,10 @@ function AcmActivationCompleted(result) {
1080 settings.xxsocket.end();
1081 exit(1);
1082 } else {
1081 - if ((cmd.profileScript !== null) && (cmd.rawpassword != null)) {
1083 + if ((settings.xxprofileScript !== null) && (settings.xxrawpassword != null)) {
1084 console.log('Intel AMT ACM activation success, applying profile...');
1083 - settings.scriptjson = cmd.profileScript;
1084 - settings.password = cmd.rawpassword; // This is only going to work if the server sends the raw password
1085 + settings.scriptjson = settings.xxprofileScript;
1086 + settings.password = settings.xxrawpassword; // This is only going to work if the server sends the raw password
1087 settings.username = 'admin';
1088 startMeScriptEx(function () { console.log('Intel AMT profile applied.'); settings.xxsocket.end(); exit(0); }, stack);
1089 } else {