vbox的更動 51862 路徑 trunk/src/VBox/Runtime/common

時間撮記:

2014-7-3 下午11:51:54 (10 年 以前)

作者:

vboxsync

訊息:

page hash updates.

位置:

trunk/src/VBox/Runtime/common

檔案:

• crypto/spc-core.cpp (修改) (2 筆差異)
• crypto/spc-sanity.cpp (修改) (2 筆差異)
• crypto/spc-template.h (修改) (2 筆差異)
• ldr/ldrPE.cpp (修改) (5 筆差異)

trunk/src/VBox/Runtime/common/crypto/spc-core.cpp

@@ -39 +39 @@
 
 
-RTDECL(int) RTCrSpcSerializedPageHashesV2_UpdateDerivedData(PRTCRSPCSERIALIZEDPAGEHASHESV2 pThis)
+RTDECL(int) RTCrSpcSerializedPageHashes_UpdateDerivedData(PRTCRSPCSERIALIZEDPAGEHASHES pThis)
 {
-    pThis->pData = (PCRTCRSPCPEIMAGEPAGEHASHESV2)pThis->RawData.Asn1Core.uData.pv;
+    pThis->pData = (PCRTCRSPCPEIMAGEPAGEHASHES)pThis->RawData.Asn1Core.uData.pv;
     return VINF_SUCCESS;
 }
@@ -50 +50 @@
  */
 
-RTDECL(PCRTCRSPCSERIALIZEDOBJECTATTRIBUTE) RTCrSpcIndirectDataContent_GetPeImageHashesV2(PCRTCRSPCINDIRECTDATACONTENT pIndData)
+RTDECL(PCRTCRSPCSERIALIZEDOBJECTATTRIBUTE)
+RTCrSpcIndirectDataContent_GetPeImageObjAttrib(PCRTCRSPCINDIRECTDATACONTENT pThis,
+                                               RTCRSPCSERIALIZEDOBJECTATTRIBUTETYPE enmType)
 {
-    if (pIndData->Data.enmType == RTCRSPCAAOVTYPE_PE_IMAGE_DATA)
+    if (pThis->Data.enmType == RTCRSPCAAOVTYPE_PE_IMAGE_DATA)
     {
-        Assert(RTAsn1ObjId_CompareWithString(&pIndData->Data.Type, RTCRSPCPEIMAGEDATA_OID) == 0);
+        Assert(RTAsn1ObjId_CompareWithString(&pThis->Data.Type, RTCRSPCPEIMAGEDATA_OID) == 0);
 
-        if (   pIndData->Data.uValue.pPeImage
-            && pIndData->Data.uValue.pPeImage->T0.File.enmChoice == RTCRSPCLINKCHOICE_MONIKER
-            && RTCrSpcSerializedObject_IsPresent(pIndData->Data.uValue.pPeImage->T0.File.u.pMoniker) )
+        if (   pThis->Data.uValue.pPeImage
+            && pThis->Data.uValue.pPeImage->T0.File.enmChoice == RTCRSPCLINKCHOICE_MONIKER
+            && RTCrSpcSerializedObject_IsPresent(pThis->Data.uValue.pPeImage->T0.File.u.pMoniker) )
         {
-            if (pIndData->Data.uValue.pPeImage->T0.File.u.pMoniker->enmType == RTCRSPCSERIALIZEDOBJECTTYPE_ATTRIBUTES)
+            if (pThis->Data.uValue.pPeImage->T0.File.u.pMoniker->enmType == RTCRSPCSERIALIZEDOBJECTTYPE_ATTRIBUTES)
             {
-                Assert(RTUuidCompareStr(pIndData->Data.uValue.pPeImage->T0.File.u.pMoniker->Uuid.Asn1Core.uData.pUuid,
+                Assert(RTUuidCompareStr(pThis->Data.uValue.pPeImage->T0.File.u.pMoniker->Uuid.Asn1Core.uData.pUuid,
                                         RTCRSPCSERIALIZEDOBJECT_UUID_STR) == 0);
-                PCRTCRSPCSERIALIZEDOBJECTATTRIBUTES pData = pIndData->Data.uValue.pPeImage->T0.File.u.pMoniker->u.pData;
+                PCRTCRSPCSERIALIZEDOBJECTATTRIBUTES pData = pThis->Data.uValue.pPeImage->T0.File.u.pMoniker->u.pData;
                 if (pData)
-                {
                     for (uint32_t i = 0; i < pData->cItems; i++)
-                    {
-                        if (pData->paItems[i].enmType == RTCRSPCSERIALIZEDOBJECTATTRIBUTETYPE_PAGE_HASHES_V2)
-                        {
-                            Assert(RTAsn1ObjId_CompareWithString(&pData->paItems[i].Type, RTCRSPC_PE_IMAGE_HASHES_V2_OID) == 0);
+                        if (pData->paItems[i].enmType == enmType)
                             return &pData->paItems[i];
-                        }
-                    }
-                }
             }
         }

trunk/src/VBox/Runtime/common/crypto/spc-sanity.cpp

@@ -123 +123 @@
                                     "SpcIndirectDataContent...pMoniker->pData is NULL.");
 
-            uint32_t cPageHashV1 = 0;
-            uint32_t cPageHashV2 = 0;
+            uint32_t cPageHashTabs = 0;
             for (uint32_t i = 0; i < pObj->u.pData->cItems; i++)
             {
                 PCRTCRSPCSERIALIZEDOBJECTATTRIBUTE pAttr = &pObj->u.pData->paItems[i];
-                if (RTAsn1ObjId_CompareWithString(&pAttr->Type, RTCRSPC_PE_IMAGE_HASHES_V2_OID) == 0)
+                if (   RTAsn1ObjId_CompareWithString(&pAttr->Type, RTCRSPC_PE_IMAGE_HASHES_V1_OID) == 0
+                    || RTAsn1ObjId_CompareWithString(&pAttr->Type, RTCRSPC_PE_IMAGE_HASHES_V2_OID) == 0 )
                 {
-                    if (cPageHashV2 > 0)
-                        return RTErrInfoSetF(pErrInfo, VERR_CR_SPC_PEIMAGE_MULTIPLE_V2_HASH_TABS,
-                                             "SpcIndirectDataContent...MonikerT1 multiple page hash v2 attributes (%u).", i);
-                    cPageHashV2++;
-                    AssertPtr(pAttr->u.pPageHashesV2->pData);
-                }
-                else if (RTAsn1ObjId_CompareWithString(&pAttr->Type, RTCRSPC_PE_IMAGE_HASHES_V1_OID) == 0)
-                {
-#if 1
-                    return RTErrInfoSetF(pErrInfo, VERR_CR_SPC_PEIMAGE_V1_HASH_TABS_NOT_IMPL,
-                                         "SpcIndirectDataContent...MonikerT1 implement page hash v1 attributes (%u).", i);
-#else
-                    if (cPageHashV1 > 0)
-                        return RTErrInfoSetF(pErrInfo, VERR_CR_SPC_PEIMAGE_MULTIPLE_V1_HASH_TABS,
-                                             "SpcIndirectDataContent...MonikerT1 multiple page hash v1 attributes (%u).", i);
-                    cPageHashV1++;
-#endif
+                    cPageHashTabs++;
+                    AssertPtr(pAttr->u.pPageHashes->pData);
                 }
                 else
@@ -153 +138 @@
                                          i, pAttr->Type.szObjId);
             }
+            if (cPageHashTabs > 0)
+                return RTErrInfoSetF(pErrInfo, VERR_CR_SPC_PEIMAGE_MULTIPLE_HASH_TABS,
+                                     "SpcIndirectDataContent...MonikerT1 multiple page hash attributes (%u).", cPageHashTabs);
+
         }
         else if (   pIndData->Data.uValue.pPeImage->T0.File.enmChoice == RTCRSPCLINKCHOICE_FILE

trunk/src/VBox/Runtime/common/crypto/spc-template.h

@@ -31 +31 @@
  * One SPC Serialized Page Hashes V2 Object.
  */
-#define RTASN1TMPL_TYPE         RTCRSPCSERIALIZEDPAGEHASHESV2
-#define RTASN1TMPL_EXT_NAME     RTCrSpcSerializedPageHashesV2
-#define RTASN1TMPL_INT_NAME     rtCrSpcSerializedPageHashesV2
+#define RTASN1TMPL_TYPE         RTCRSPCSERIALIZEDPAGEHASHES
+#define RTASN1TMPL_EXT_NAME     RTCrSpcSerializedPageHashes
+#define RTASN1TMPL_INT_NAME     rtCrSpcSerializedPageHashes
 RTASN1TMPL_BEGIN_SETCORE();
 RTASN1TMPL_MEMBER(              RawData,               RTASN1OCTETSTRING,           RTAsn1OctetString);
-RTASN1TMPL_EXEC_DECODE(         rc = RTCrSpcSerializedPageHashesV2_UpdateDerivedData(pThis) ) /* no ; */
-RTASN1TMPL_EXEC_CLONE(          rc = RTCrSpcSerializedPageHashesV2_UpdateDerivedData(pThis) ) /* no ; */
+RTASN1TMPL_EXEC_DECODE(         rc = RTCrSpcSerializedPageHashes_UpdateDerivedData(pThis) ) /* no ; */
+RTASN1TMPL_EXEC_CLONE(          rc = RTCrSpcSerializedPageHashes_UpdateDerivedData(pThis) ) /* no ; */
 RTASN1TMPL_END_SETCORE();
 #undef RTASN1TMPL_TYPE
@@ -53 +53 @@
 RTASN1TMPL_MEMBER(              Type,               RTASN1OBJID,                    RTAsn1ObjId);
 RTASN1TMPL_MEMBER_DYN_BEGIN(    RTCRSPCSERIALIZEDOBJECTATTRIBUTETYPE, enmType, Allocation);
-RTASN1TMPL_MEMBER_DYN(          u, pPageHashesV2, RTCRSPCSERIALIZEDPAGEHASHESV2, RTCrSpcSerializedPageHashesV2, Allocation, enmType,
+RTASN1TMPL_MEMBER_DYN(          u, pPageHashes, RTCRSPCSERIALIZEDPAGEHASHES, RTCrSpcSerializedPageHashes, Allocation, enmType,
+    RTCRSPCSERIALIZEDOBJECTATTRIBUTETYPE_PAGE_HASHES_V1, RTAsn1ObjId_CompareWithString(&pThis->Type, RTCRSPC_PE_IMAGE_HASHES_V1_OID) == 0);
+RTASN1TMPL_MEMBER_DYN(          u, pPageHashes, RTCRSPCSERIALIZEDPAGEHASHES, RTCrSpcSerializedPageHashes, Allocation, enmType,
     RTCRSPCSERIALIZEDOBJECTATTRIBUTETYPE_PAGE_HASHES_V2, RTAsn1ObjId_CompareWithString(&pThis->Type, RTCRSPC_PE_IMAGE_HASHES_V2_OID) == 0);
 RTASN1TMPL_MEMBER_DYN_DEFAULT(  u, pCore, RTASN1CORE, RTAsn1Core, Allocation, enmType, RTCRSPCSERIALIZEDOBJECTATTRIBUTETYPE_UNKNOWN);

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

@@ -2136 +2136 @@
 
 
-static int rtldrPE_VerifyAllPageHashesV2(PRTLDRMODPE pModPe, PCRTCRSPCSERIALIZEDOBJECTATTRIBUTE pAttrib, RTDIGESTTYPE enmDigest,
-                                         void *pvScratch, size_t cbScratch, PRTERRINFO pErrInfo)
+static int rtldrPE_VerifyAllPageHashes(PRTLDRMODPE pModPe, PCRTCRSPCSERIALIZEDOBJECTATTRIBUTE pAttrib, RTDIGESTTYPE enmDigest,
+                                       void *pvScratch, size_t cbScratch, PRTERRINFO pErrInfo)
 {
     AssertReturn(cbScratch >= _4K, VERR_INTERNAL_ERROR_3);
@@ -2144 +2144 @@
      * Calculate the special places.
      */
-    RTLDRPEHASHSPECIALS SpecialPlaces;
+    RTLDRPEHASHSPECIALS SpecialPlaces = { 0, 0, 0, 0, 0, 0 }; /* shut up gcc */
     int rc = rtldrPe_CalcSpecialHashPlaces(pModPe, &SpecialPlaces, pErrInfo);
     if (RT_FAILURE(rc))
@@ -2150 +2150 @@
 
     uint32_t const cbHash = rtLdrPE_HashGetHashSize(enmDigest);
-    uint32_t const cPages = pAttrib->u.pPageHashesV2->RawData.Asn1Core.cb / (cbHash + 4);
-    if (cPages * (cbHash + 4) != pAttrib->u.pPageHashesV2->RawData.Asn1Core.cb)
+    uint32_t const cPages = pAttrib->u.pPageHashes->RawData.Asn1Core.cb / (cbHash + 4);
+    if (cPages * (cbHash + 4) != pAttrib->u.pPageHashes->RawData.Asn1Core.cb)
         return RTErrInfoSetF(pErrInfo, VERR_LDRVI_PAGE_HASH_TAB_SIZE_OVERFLOW,
                              "Page Hashes V2 size issue: cb=%#x cbHash=%#x",
-                             pAttrib->u.pPageHashesV2->RawData.Asn1Core.cb, cbHash);
+                             pAttrib->u.pPageHashes->RawData.Asn1Core.cb, cbHash);
 
     /*
@@ -2166 +2166 @@
     uint32_t        offSectEnd = pModPe->cbHeaders;
     uint32_t        iSh        = UINT32_MAX;
-    uint8_t const  *pbHashTab  = pAttrib->u.pPageHashesV2->RawData.Asn1Core.uData.pu8;
+    uint8_t const  *pbHashTab  = pAttrib->u.pPageHashes->RawData.Asn1Core.uData.pu8;
     for (uint32_t iPage = 0; iPage < cPages; iPage++)
     {
@@ -2357 +2357 @@
             /*
              * Compare the page hashes if present.
+             *
+             * 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
+             * algorithm was supposed to be RTCRSPCINDIRECTDATACONTENT::DigestInfo,
+             * i.e. the same as for the whole image hash.  The initial approach
+             * worked just fine, but this makes more sense.
+             *
+             * (See also comments in osslsigncode.c (google it).)
              */
-            PCRTCRSPCSERIALIZEDOBJECTATTRIBUTE pAttrib = RTCrSpcIndirectDataContent_GetPeImageHashesV2(pSignature->pIndData);
+            PCRTCRSPCSERIALIZEDOBJECTATTRIBUTE pAttrib;
+            pAttrib = RTCrSpcIndirectDataContent_GetPeImageObjAttrib(pSignature->pIndData,
+                                                                     RTCRSPCSERIALIZEDOBJECTATTRIBUTETYPE_PAGE_HASHES_V2);
             if (pAttrib)
-                rc = rtldrPE_VerifyAllPageHashesV2(pModPe, pAttrib, pSignature->enmDigest, pvScratch, cbScratch, pErrInfo);
-
+                rc = rtldrPE_VerifyAllPageHashes(pModPe, pAttrib, RTDIGESTTYPE_SHA256, pvScratch, cbScratch, pErrInfo);
+            else
+            {
+                pAttrib = RTCrSpcIndirectDataContent_GetPeImageObjAttrib(pSignature->pIndData,
+                                                                         RTCRSPCSERIALIZEDOBJECTATTRIBUTETYPE_PAGE_HASHES_V1);
+                if (pAttrib)
+                    rc = rtldrPE_VerifyAllPageHashes(pModPe, pAttrib, RTDIGESTTYPE_SHA1, pvScratch, cbScratch, pErrInfo);
+            }
             return rc;
         }