IDE-Redirect improvements.

Ylianst · Jul 6, 2022 · 345710b · 345710b
1 parent d1800bf
commit 345710b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/amt-certificates-0.0.1.js b/amt-certificates-0.0.1.js
@@ -25,10 +25,10 @@ function amtcert_linkCertPrivateKey(certs, keys) {
 
 // Check which key pair matches the public key in the certificate
 function amtcert_linkCertPrivateKey(certs, keys) {
+    if ((keys == null) || (keys.length == 0)) return;
     for (var i in certs) {
         var cert = certs[i];
         try {
-            if (keys.length == 0) return;
             var publicKeyPEM = forge.pki.publicKeyToPem(forge.pki.certificateFromAsn1(forge.asn1.fromDer(cert.X509Certificate)).publicKey).substring(28 + 32).replace(/(\r\n|\n|\r)/gm, "");
             publicKeyPEM = publicKeyPEM.substring(0, publicKeyPEM.length - 24); // Remove the PEM footer
             for (var j = 0; j < keys.length; j++) {

diff --git a/amt-ider-ws-0.0.1.js b/amt-ider-ws-0.0.1.js
@@ -64,6 +64,9 @@ var CreateAmtRemoteIder = function () {
     var IDE_ModeSence_Ls120Error_Recovery_Array = String.fromCharCode(0x00, 0x12, 0x31, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0A, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00);
     var IDE_ModeSence_CDError_Recovery_Array = String.fromCharCode(0x00, 0x0E, 0x01, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x06, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00);
 
+    // CD info and performance
+    var RD_CD_DiskInfo = String.fromCharCode(0x00, 0x20, 0x0e, 0x01, 0x01, 0x01, 0x01, 0x20, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00);
+    var RD_CD_Performance = String.fromCharCode(0x00, 0x00, 0x00, 0x04, 0x02, 0x00, 0x00, 0x00);
 
     // Private method, called by parent when it change state
     obj.xxStateChange = function (newstate) {
@@ -629,6 +632,12 @@ var CreateAmtRemoteIder = function () {
                     obj.SendDataToHost(dev, true, r, featureRegister & 1);
                 }
                 break;
+            case 0x51: // READ_DISK_INFORMATION
+                obj.SendDataToHost(dev, true, RD_CD_DiskInfo, featureRegister & 1);
+                break;
+            case 0xAC: // GET_PERFORMANCE
+                obj.SendDataToHost(dev, true, RD_CD_Performance, featureRegister & 1);
+                break;
             default: // UNKNOWN COMMAND
                 // ###BEGIN###{IDERDebug}
                 debug('IDER: Unknown SCSI command', cdb.charCodeAt(0));

diff --git a/amt-redir-ws-0.1.0.js b/amt-redir-ws-0.1.0.js
@@ -127,9 +127,6 @@ var CreateAmtRedirect = function (module, authCookie) {
                     cmdsize = 9 + authDataLen;
                     // ###BEGIN###{!Mode-Firmware}
                     if (authType == 0) {
-
-                        console.log('aaa', authData);
-
                         // Query
                         if (authData.indexOf(4) >= 0) {
                             // Good Digest Auth (With cnonce and all)