Changeset 74707 in vbox for trunk

Timestamp:

Oct 9, 2018 8:36:39 AM (6 years ago)

Author:

vboxsync

Message:

IPRT/ldr: Started on Mach-O code signature verification. bugref:9232

Location:

trunk

Files:

• include/iprt/ldr.h (modified) (1 diff)
• src/VBox/Runtime/common/ldr/ldrMachO.cpp (modified) (2 diffs)
• src/VBox/Runtime/common/ldr/ldrPE.cpp (modified) (1 diff)
• src/VBox/Runtime/tools/RTSignTool.cpp (modified) (2 diffs)

trunk/include/iprt/ldr.h

@@ -1181 +1181 @@
  *
  */
-typedef DECLCALLBACK(int) FNRTLDRVALIDATESIGNEDDATA(RTLDRMOD hLdrMod, RTLDRSIGNATURETYPE enmSignature, void const *pvSignature, size_t cbSignature,
+typedef DECLCALLBACK(int) FNRTLDRVALIDATESIGNEDDATA(RTLDRMOD hLdrMod, RTLDRSIGNATURETYPE enmSignature,
+                                                    void const *pvSignature, size_t cbSignature,
                                                     PRTERRINFO pErrInfo, void *pvUser);
 /** Pointer to a signature verification callback. */

trunk/src/VBox/Runtime/common/ldr/ldrMachO.cpp

@@ -3966 +3966 @@
 
 /**
+ * @interface_method_impl{RTLDROPS,pfnVerifySignature}
+ */
+static DECLCALLBACK(int)
+rtldrMachO_VerifySignature(PRTLDRMODINTERNAL pMod, PFNRTLDRVALIDATESIGNEDDATA pfnCallback, void *pvUser, PRTERRINFO pErrInfo)
+{
+#ifndef IPRT_WITHOUT_LDR_VERIFY
+    PRTLDRMODMACHO pThis = RT_FROM_MEMBER(pMod, RTLDRMODMACHO, Core);
+
+    int rc = rtldrMachO_LoadSignatureBlob(pThis);
+    if (RT_SUCCESS(rc))
+    {
+        RT_NOREF(pfnCallback, pvUser, pErrInfo);
+#if 0
+        int rc = rtldrPE_VerifySignatureImagePrecoditions(pModPe, pErrInfo);
+        if (RT_SUCCESS(rc))
+        {
+            PRTLDRPESIGNATURE pSignature = NULL;
+            rc = rtldrPE_VerifySignatureRead(pModPe, &pSignature, pErrInfo);
+            if (RT_SUCCESS(rc))
+            {
+                rc = rtldrPE_VerifySignatureDecode(pModPe, pSignature, pErrInfo);
+                if (RT_SUCCESS(rc))
+                    rc = rtldrPE_VerifySignatureValidateHash(pModPe, pSignature, pErrInfo);
+                if (RT_SUCCESS(rc))
+                {
+                    rc = pfnCallback(&pModPe->Core, RTLDRSIGNATURETYPE_PKCS7_SIGNED_DATA,
+                                     &pSignature->ContentInfo, sizeof(pSignature->ContentInfo),
+                                     pErrInfo, pvUser);
+                }
+                rtldrPE_VerifySignatureDestroy(pModPe, pSignature);
+            }
+        }
+#endif
+    }
+    return rc;
+#else
+    RT_NOREF_PV(pMod); RT_NOREF_PV(pfnCallback); RT_NOREF_PV(pvUser); RT_NOREF_PV(pErrInfo);
+    return VERR_NOT_SUPPORTED;
+#endif
+}
+
+
+/**
  * Operations for a Mach-O module interpreter.
  */
@@ -3989 +4032 @@
     rtldrMachO_ReadDbgInfo,
     rtldrMachO_QueryProp,
-    NULL /*pfnVerifySignature*/,
+    rtldrMachO_VerifySignature,
     NULL /*pfnHashImage*/,
     NULL /*pfnUnwindFrame*/,

trunk/src/VBox/Runtime/common/ldr/ldrPE.cpp

@@ -2840 +2840 @@
              *
              * Seems the difference between V1 and V2 page hash attributes is
-             * that v1 uses SHA-1 while v2 uses SHA-256. The data structures to
-             * be identical otherwise.  Initially we assumed the digest
+             * that v1 uses SHA-1 while v2 uses SHA-256. The data structures
+             * seems to be identical otherwise.  Initially we assumed the digest
              * algorithm was supposed to be RTCRSPCINDIRECTDATACONTENT::DigestInfo,
              * i.e. the same as for the whole image hash.  The initial approach

trunk/src/VBox/Runtime/tools/RTSignTool.cpp

@@ -1421 +1421 @@
 
 
+    RTTIMESPEC Now;
+    bool       fTriedNow = false;
     rc = RTLdrQueryProp(hLdrMod, RTLDRPROP_TIMESTAMP_SECONDS, &pState->uTimestamp, sizeof(pState->uTimestamp));
+    if (rc == VERR_NOT_FOUND)
+    {
+        fTriedNow = true;
+        pState->uTimestamp = RTTimeSpecGetSeconds(RTTimeNow(&Now));
+        rc = VINF_SUCCESS;
+    }
     if (RT_SUCCESS(rc))
     {
@@ -1427 +1435 @@
         if (RT_SUCCESS(rc))
             RTMsgInfo("'%s' is valid.\n", pszFilename);
-        else if (rc == VERR_CR_X509_CPV_NOT_VALID_AT_TIME)
-        {
-            RTTIMESPEC Now;
+        else if (rc == VERR_CR_X509_CPV_NOT_VALID_AT_TIME && !fTriedNow)
+        {
             pState->uTimestamp = RTTimeSpecGetSeconds(RTTimeNow(&Now));
             rc = RTLdrVerifySignature(hLdrMod, VerifyExeCallback, pState, RTErrInfoInitStatic(pStaticErrInfo));