From 2e29cfe67e0ee3be9379cdb8af10f9a2ee6b5134 Mon Sep 17 00:00:00 2001
From: Ylian Saint-Hilaire <ysainthilaire@hotmail.com>
Date: Thu, 11 Nov 2021 12:42:46 -0800
Subject: [PATCH] startConfigurationHBased fix for Intel AMT TLS ACM
 activation.

---
 agents/modules_meshcmd/amt-mei.js  | 12 ++++++------
 agents/modules_meshcore/amt-mei.js | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/agents/modules_meshcmd/amt-mei.js b/agents/modules_meshcmd/amt-mei.js
index 49811a42..f9541abc 100644
--- a/agents/modules_meshcmd/amt-mei.js
+++ b/agents/modules_meshcmd/amt-mei.js
@@ -456,13 +456,13 @@ function amt_heci()
         for (var i = 4; i < arguments.length; ++i) { optional.push(arguments[i]); }
 
         // Format the command
-        var data = Buffer.alloc(4 + 64 + 4 + 4 + 320);
-        data.writeUInt32LE((certHash.length == 48) ? 3 : 2, 0); // Write certificate hash type: SHA256 = 2, SHA384 = 3
-        certHash.copy(data, 4); // Write the hash
-        data.writeUInt32LE(hostVpn ? 1 : 0, 68); // Write is HostVPN is enabled
+        var data = Buffer.alloc(1 + 64 + 4 + 4 + 320);
+        data[0] = (certHash.length == 48) ? 3 : 2 // Write certificate hash type: SHA256 = 2, SHA384 = 3
+        certHash.copy(data, 1); // Write the hash
+        data.writeUInt32LE(hostVpn ? 1 : 0, 65); // Write is HostVPN is enabled
         if (dnsSuffixList != null) {
-            data.writeUInt32LE(dnsSuffixList.length, 72); // Write the number of DNS Suffix, from 0 to 4
-            var ptr = 76;
+            data.writeUInt32LE(dnsSuffixList.length, 69); // Write the number of DNS Suffix, from 0 to 4
+            var ptr = 73;
             for (var i = 0; i < dnsSuffixList.length; i++) { ptr += data.write(dnsSuffixList[i], ptr) + 1; } // Write up to 4 DNS Suffix with null seperation.
         }
 
diff --git a/agents/modules_meshcore/amt-mei.js b/agents/modules_meshcore/amt-mei.js
index 49811a42..f9541abc 100644
--- a/agents/modules_meshcore/amt-mei.js
+++ b/agents/modules_meshcore/amt-mei.js
@@ -456,13 +456,13 @@ function amt_heci()
         for (var i = 4; i < arguments.length; ++i) { optional.push(arguments[i]); }
 
         // Format the command
-        var data = Buffer.alloc(4 + 64 + 4 + 4 + 320);
-        data.writeUInt32LE((certHash.length == 48) ? 3 : 2, 0); // Write certificate hash type: SHA256 = 2, SHA384 = 3
-        certHash.copy(data, 4); // Write the hash
-        data.writeUInt32LE(hostVpn ? 1 : 0, 68); // Write is HostVPN is enabled
+        var data = Buffer.alloc(1 + 64 + 4 + 4 + 320);
+        data[0] = (certHash.length == 48) ? 3 : 2 // Write certificate hash type: SHA256 = 2, SHA384 = 3
+        certHash.copy(data, 1); // Write the hash
+        data.writeUInt32LE(hostVpn ? 1 : 0, 65); // Write is HostVPN is enabled
         if (dnsSuffixList != null) {
-            data.writeUInt32LE(dnsSuffixList.length, 72); // Write the number of DNS Suffix, from 0 to 4
-            var ptr = 76;
+            data.writeUInt32LE(dnsSuffixList.length, 69); // Write the number of DNS Suffix, from 0 to 4
+            var ptr = 73;
             for (var i = 0; i < dnsSuffixList.length; i++) { ptr += data.write(dnsSuffixList[i], ptr) + 1; } // Write up to 4 DNS Suffix with null seperation.
         }