Changeset 26331 in vbox

Timestamp:

Feb 8, 2010 4:17:35 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

57415

Message:

SMC: read OSK from the device

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl2.cpp (modified) (2 diffs)
• Makefile.kmk (modified) (1 diff)
• darwin/iokit.cpp (modified) (2 diffs)
• darwin/iokit.h (modified) (1 diff)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -156 +156 @@
 
     return S_OK;
+}
+
+static int getSmcDeviceKey(IMachine* pMachine, BSTR * aKey)
+{
+    int rc;
+
+# if defined(RT_OS_DARWIN)
+    char aKeyBuf[65];
+
+    rc = DarwinSmcKey(aKeyBuf, sizeof aKeyBuf);
+    if (SUCCEEDED(rc))
+    {
+        Bstr(aKeyBuf).detachTo(aKey);
+        return rc;
+    }
+#endif
+
+    return pMachine->GetExtraData(Bstr("VBoxInternal2/SmcDeviceKey"), aKey);
 }
 
@@ -540 +558 @@
         rc = CFGMR3InsertInteger(pInst, "Trusted",   1);     /* boolean */   RC_CHECK();
         rc = CFGMR3InsertNode(pInst,    "Config", &pCfg);                    RC_CHECK();
-        rc = pMachine->GetExtraData(Bstr("VBoxInternal2/SmcDeviceKey"), tmpStr2.asOutParam()); RC_CHECK();
+        rc = getSmcDeviceKey(pMachine,   tmpStr2.asOutParam());              RC_CHECK();
         rc = CFGMR3InsertString(pCfg,   "DeviceKey", Utf8Str(tmpStr2).raw());RC_CHECK();
     }

trunk/src/VBox/Main/Makefile.kmk

@@ -588 +588 @@
 VBoxC_LDFLAGS.darwin = \
         -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/components/VBoxC.dylib \
-        -exported_symbols_list $(PATH_VBoxC)/VBoxC.def
+        -exported_symbols_list $(PATH_VBoxC)/VBoxC.def \
+        -framework IOKit
 ifdef VBOX_USE_VCC80
  VBoxC_LDFLAGS.win = /MANIFEST

trunk/src/VBox/Main/darwin/iokit.cpp

@@ -1679 +1679 @@
 }
 
+int DarwinSmcKey(char* aKey, uint32_t iKeySize)
+{
+    int rc;
+    /* Based on Amith Singh SMC reading code sample in OS X Book */
+    typedef struct {
+        uint32_t   key;
+        uint8_t    __d0[22];
+        uint32_t   datasize;
+        uint8_t    __d1[10];
+        uint8_t    cmd;
+        uint32_t   __d2;
+        uint8_t    data[32];
+    } AppleSMCBuffer_t;
+
+
+    if (iKeySize < 65)
+        return VERR_INTERNAL_ERROR;
+
+    io_service_t service = IOServiceGetMatchingService(kIOMasterPortDefault,
+                                                       IOServiceMatching("AppleSMC"));
+    if (!service)
+        return VERR_INTERNAL_ERROR;
+
+    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 VERR_INTERNAL_ERROR;
+
+
+    AppleSMCBuffer_t inputStruct = { 0, {0}, 32, {0}, 5, }, outputStruct;
+    size_t outputStructCnt = sizeof(outputStruct);
+    char osk[65];
+
+    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,
+                                       &outputStructCnt);
+        if (kr != kIOReturnSuccess)
+            return VERR_INTERNAL_ERROR;
+
+        for (int j=0; j<32; j++)
+            aKey[j + i*32] = outputStruct.data[j];
+    }
+
+    aKey[64] = 0;
+
+    return rc;
+}
+
 #ifdef STANDALONE_TESTCASE
 /**
@@ -1796 +1851 @@
 }
 #endif
-
-

trunk/src/VBox/Main/darwin/iokit.h

@@ -87 +87 @@
 PDARWINDVD      DarwinGetDVDDrives(void);
 PDARWINETHERNIC DarwinGetEthernetControllers(void);
+int             DarwinSmcKey(char* aKey, uint32_t iKeySize);
 RT_C_DECLS_END
 
 #endif
-