Changeset 55362 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Apr 21, 2015 5:28:50 PM (10 years ago)

Author:

vboxsync

Message:

DevSmc cleanup

File:

• trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -132 +132 @@
 
 
-
-#if defined(RT_OS_DARWIN)
-
-static int DarwinSmcKey(char *pabKey, uint32_t cbKey)
-{
-    /*
-     * Method as described in Amit Singh's article:
-     *   http://osxbook.com/book/bonus/chapter7/tpmdrmmyth/
-     */
-    typedef struct
-    {
-        uint32_t   key;
-        uint8_t    pad0[22];
-        uint32_t   datasize;
-        uint8_t    pad1[10];
-        uint8_t    cmd;
-        uint32_t   pad2;
-        uint8_t    data[32];
-    } AppleSMCBuffer;
-
-    AssertReturn(cbKey >= 65, VERR_INTERNAL_ERROR);
-
-    io_service_t service = IOServiceGetMatchingService(kIOMasterPortDefault,
-                                                       IOServiceMatching("AppleSMC"));
-    if (!service)
-        return VERR_NOT_FOUND;
-
-    io_connect_t    port = (io_connect_t)0;
-    kern_return_t   kr   = IOServiceOpen(service, mach_task_self(), 0, &port);
-    IOObjectRelease(service);
-
-    if (kr != kIOReturnSuccess)
-        return RTErrConvertFromDarwin(kr);
-
-    AppleSMCBuffer  inputStruct    = { 0, {0}, 32, {0}, 5, };
-    AppleSMCBuffer  outputStruct;
-    size_t          cbOutputStruct = sizeof(outputStruct);
-
-    for (int i = 0; i < 2; i++)
-    {
-        inputStruct.key = (uint32_t)(i == 0 ? 'OSK0' : 'OSK1');
-        kr = IOConnectCallStructMethod((mach_port_t)port,
-                                       (uint32_t)2,
-                                       (const void *)&inputStruct,
-                                       sizeof(inputStruct),
-                                       (void *)&outputStruct,
-                                       &cbOutputStruct);
-        if (kr != kIOReturnSuccess)
-        {
-            IOServiceClose(port);
-            return RTErrConvertFromDarwin(kr);
-        }
-
-        for (int j = 0; j < 32; j++)
-            pabKey[j + i*32] = outputStruct.data[j];
-    }
-
-    IOServiceClose(port);
-
-    pabKey[64] = 0;
-
-    return VINF_SUCCESS;
-}
-
-#endif /* RT_OS_DARWIN */
-
 /* Darwin compile kludge */
 #undef PVM
@@ -273 +207 @@
 
 #ifdef RT_OS_DARWIN
+
     /*
-     * Query it here and now.
+     * Work done in EFI/DevSmc
      */
-    char abKeyBuf[65];
-    int rc = DarwinSmcKey(abKeyBuf, sizeof(abKeyBuf));
-    if (SUCCEEDED(rc))
-    {
-        *pStrKey = abKeyBuf;
-        *pfGetKeyFromRealSMC = true;
-        return rc;
-    }
-    LogRel(("Warning: DarwinSmcKey failed with rc=%Rrc!\n", rc));
+    *pfGetKeyFromRealSMC = true;
+    int rc = VINF_SUCCESS;
 
 #else
@@ -1596 +1524 @@
             AssertRCReturn(rc, rc);
 
-            InsertConfigString(pCfg,   "DeviceKey", strKey);
+            if (!fGetKeyFromRealSMC)
+                InsertConfigString(pCfg,   "DeviceKey", strKey);
             InsertConfigInteger(pCfg,  "GetKeyFromRealSMC", fGetKeyFromRealSMC);
         }