Changeset 51862 in vbox for trunk/include

Timestamp:

Jul 3, 2014 11:51:54 PM (11 years ago)

Author:

vboxsync

Message:

page hash updates.

Location:

trunk/include/iprt

Files:

• crypto/spc.h (modified) (6 diffs)
• err.h (modified) (1 diff)
• mangling.h (modified) (2 diffs)

trunk/include/iprt/crypto/spc.h

@@ -42 +42 @@
 
 /**
- * PE Image page hash table, version 2.
- */
-typedef union RTCRSPCPEIMAGEPAGEHASHESV2
+ * PE Image page hash table, generic union.
+ *
+ * @remarks This table isn't used by ldrPE.cpp, it walks the table in a generic
+ *          fashion using the hash size. So, we can ditch it if we feel like it.
+ */
+typedef union RTCRSPCPEIMAGEPAGEHASHES
 {
     /** MD5 page hashes. */
@@ -81 +84 @@
         uint8_t         abHash[RTSHA512_HASH_SIZE];
     } aSha512[1];
-} RTCRSPCPEIMAGEPAGEHASHESV2;
-/** Pointer to a version 2 PE image hash table. */
-typedef RTCRSPCPEIMAGEPAGEHASHESV2 *PRTCRSPCPEIMAGEPAGEHASHESV2;
-/** Pointer to a const version 2 PE image hash table. */
-typedef RTCRSPCPEIMAGEPAGEHASHESV2 const *PCRTCRSPCPEIMAGEPAGEHASHESV2;
-
-
-/**
- * Serialization wrapper for raw RTCRSPCPEIMAGEPAGEHASHESV2 data.
- */
-typedef struct RTCRSPCSERIALIZEDPAGEHASHESV2
+} RTCRSPCPEIMAGEPAGEHASHES;
+/** Pointer to a PE image page hash table union. */
+typedef RTCRSPCPEIMAGEPAGEHASHES *PRTCRSPCPEIMAGEPAGEHASHES;
+/** Pointer to a const PE image page hash table union. */
+typedef RTCRSPCPEIMAGEPAGEHASHES const *PCRTCRSPCPEIMAGEPAGEHASHES;
+
+
+/**
+ * Serialization wrapper for raw RTCRSPCPEIMAGEPAGEHASHES data.
+ */
+typedef struct RTCRSPCSERIALIZEDPAGEHASHES
 {
     /** The page hashes are within a set. Dunno if there could be multiple
@@ -100 +103 @@
 
     /** Pointer to the hash data within that string.
-     * The hash algorithm is the same as for the full image hash and given in
-     * RTCRPKCS7SIGNEDDATA::SignerInfos.paSignerInfos[0].DigestAlgorithm as well as
-     * in RTCRSPCINDIRECTDATACONTENT::DigestInfo.DigestAlgorithm. */
-    PCRTCRSPCPEIMAGEPAGEHASHESV2    pData;
+     * The hash algorithm is given by the object attribute type in
+     * RTCRSPCSERIALIZEDOBJECTATTRIBUTE.  It is generally the same as for the
+     * whole image hash. */
+    PCRTCRSPCPEIMAGEPAGEHASHES      pData;
     /** Field the user can use to store the number of pages in pData. */
     uint32_t                        cPages;
-} RTCRSPCSERIALIZEDPAGEHASHESV2;
-/** Pointer to a serialized object attribute.  */
-typedef RTCRSPCSERIALIZEDPAGEHASHESV2 *PRTCRSPCSERIALIZEDPAGEHASHESV2;
-/** Pointer to a const serialized object attribute.  */
-typedef RTCRSPCSERIALIZEDPAGEHASHESV2 const *PCRTCRSPCSERIALIZEDPAGEHASHESV2;
-RTASN1TYPE_STANDARD_PROTOTYPES(RTCRSPCSERIALIZEDPAGEHASHESV2, RTDECL, RTCrSpcSerializedPageHashesV2, SetCore.Asn1Core);
-
-RTDECL(int) RTCrSpcSerializedPageHashesV2_UpdateDerivedData(PRTCRSPCSERIALIZEDPAGEHASHESV2 pThis);
+} RTCRSPCSERIALIZEDPAGEHASHES;
+/** Pointer to a serialized wrapper for page hashes.  */
+typedef RTCRSPCSERIALIZEDPAGEHASHES *PRTCRSPCSERIALIZEDPAGEHASHES;
+/** Pointer to a const serialized wrapper for page hashes.  */
+typedef RTCRSPCSERIALIZEDPAGEHASHES const *PCRTCRSPCSERIALIZEDPAGEHASHES;
+RTASN1TYPE_STANDARD_PROTOTYPES(RTCRSPCSERIALIZEDPAGEHASHES, RTDECL, RTCrSpcSerializedPageHashes, SetCore.Asn1Core);
+
+RTDECL(int) RTCrSpcSerializedPageHashes_UpdateDerivedData(PRTCRSPCSERIALIZEDPAGEHASHES pThis);
 
 
@@ -127 +130 @@
     /** Unknown object. */
     RTCRSPCSERIALIZEDOBJECTATTRIBUTETYPE_UNKNOWN,
-    /** Page hashes v2 (pPageHashesV2). */
+    /** SHA-1 page hashes (pPageHashes). */
+    RTCRSPCSERIALIZEDOBJECTATTRIBUTETYPE_PAGE_HASHES_V1,
+    /** SHA-256 page hashes (pPageHashes). */
     RTCRSPCSERIALIZEDOBJECTATTRIBUTETYPE_PAGE_HASHES_V2,
     /** End of valid values. */
@@ -153 +158 @@
         /** The unknown value (RTCRSPCSERIALIZEDOBJECTATTRIBUTETYPE_UNKNOWN). */
         PRTASN1CORE                         pCore;
-        /** Page hashes v2 (RTCRSPCSERIALIZEDOBJECTATTRIBUTETYPE_PAGE_HASHES_V2).  */
-        PRTCRSPCSERIALIZEDPAGEHASHESV2      pPageHashesV2;
+        /** Page hashes (RTCRSPCSERIALIZEDOBJECTATTRIBUTETYPE_PAGE_HASHES_V1 or
+         *  RTCRSPCSERIALIZEDOBJECTATTRIBUTETYPE_PAGE_HASHES_V2). */
+        PRTCRSPCSERIALIZEDPAGEHASHES        pPageHashes;
     } u;
 } RTCRSPCSERIALIZEDOBJECTATTRIBUTE;
@@ -468 +474 @@
 
 /**
- * Gets the PE image hash v2 SPC serialized object attribute if present.
- *
- * @returns Pointer to the attribute with Type RTCRSPC_PE_IMAGE_HASHES_V2_OID if
- *          found, NULL if not found.
- * @param   pIndData            The Authenticode SpcIndirectDataContent.
- */
-RTDECL(PCRTCRSPCSERIALIZEDOBJECTATTRIBUTE) RTCrSpcIndirectDataContent_GetPeImageHashesV2(PCRTCRSPCINDIRECTDATACONTENT pIndData);
+ * Gets the first SPC serialized object attribute in a SPC PE image.
+ *
+ * @returns Pointer to the attribute with the given type, NULL if not found.
+ * @param   pThis               The Authenticode SpcIndirectDataContent.
+ */
+RTDECL(PCRTCRSPCSERIALIZEDOBJECTATTRIBUTE)
+RTCrSpcIndirectDataContent_GetPeImageObjAttrib(PCRTCRSPCINDIRECTDATACONTENT pThis,
+                                               RTCRSPCSERIALIZEDOBJECTATTRIBUTETYPE enmType);
 
 /** @} */

trunk/include/iprt/err.h

@@ -2359 +2359 @@
 /** Internal SPC error: Bad object moniker data pointer. */
 #define VERR_CR_SPC_MONIKER_BAD_DATA                            (-23412)
-/** Multiple v2 PE image page hash tables. */
-#define VERR_CR_SPC_PEIMAGE_MULTIPLE_V2_HASH_TABS               (-23413)
-/** Version 1 PE image page hash tables has not been implemented/tested. */
-#define VERR_CR_SPC_PEIMAGE_V1_HASH_TABS_NOT_IMPL               (-23414)
+/** Multiple PE image page hash tables. */
+#define VERR_CR_SPC_PEIMAGE_MULTIPLE_HASH_TABS                  (-23413)
 /** Unknown SPC PE image attribute. */
-#define VERR_CR_SPC_PEIMAGE_UNKNOWN_ATTRIBUTE                   (-23415)
+#define VERR_CR_SPC_PEIMAGE_UNKNOWN_ATTRIBUTE                   (-23414)
 /** URL not expected in SPC PE image data. */
-#define VERR_CR_SPC_PEIMAGE_URL_UNEXPECTED                      (-23416)
+#define VERR_CR_SPC_PEIMAGE_URL_UNEXPECTED                      (-23415)
 /** PE image data without any valid content was not expected. */
-#define VERR_CR_SPC_PEIMAGE_NO_CONTENT                          (-23417)
+#define VERR_CR_SPC_PEIMAGE_NO_CONTENT                          (-23416)
 /** @} */
 

trunk/include/iprt/mangling.h

@@ -2447 +2447 @@
 # define RTCrSpcIndirectDataContent_Delete              RT_MANGLER(RTCrSpcIndirectDataContent_Delete)
 # define RTCrSpcIndirectDataContent_Enum                RT_MANGLER(RTCrSpcIndirectDataContent_Enum)
-# define RTCrSpcIndirectDataContent_GetPeImageHashesV2  RT_MANGLER(RTCrSpcIndirectDataContent_GetPeImageHashesV2)
+# define RTCrSpcIndirectDataContent_GetPeImageObjAttrib RT_MANGLER(RTCrSpcIndirectDataContent_GetPeImageObjAttrib)
 # define RTCrSpcLink_Compare                            RT_MANGLER(RTCrSpcLink_Compare)
 # define RTCrSpcLink_Delete                             RT_MANGLER(RTCrSpcLink_Delete)
@@ -2463 +2463 @@
 # define RTCrSpcSerializedObject_Delete                 RT_MANGLER(RTCrSpcSerializedObject_Delete)
 # define RTCrSpcSerializedObject_Enum                   RT_MANGLER(RTCrSpcSerializedObject_Enum)
-# define RTCrSpcSerializedPageHashesV2_Compare          RT_MANGLER(RTCrSpcSerializedPageHashesV2_Compare)
-# define RTCrSpcSerializedPageHashesV2_Delete           RT_MANGLER(RTCrSpcSerializedPageHashesV2_Delete)
-# define RTCrSpcSerializedPageHashesV2_Enum             RT_MANGLER(RTCrSpcSerializedPageHashesV2_Enum)
-# define RTCrSpcSerializedPageHashesV2_UpdateDerivedData RT_MANGLER(RTCrSpcSerializedPageHashesV2_UpdateDerivedData)
+# define RTCrSpcSerializedPageHashes_Compare            RT_MANGLER(RTCrSpcSerializedPageHashes_Compare)
+# define RTCrSpcSerializedPageHashes_Delete             RT_MANGLER(RTCrSpcSerializedPageHashes_Delete)
+# define RTCrSpcSerializedPageHashes_Enum               RT_MANGLER(RTCrSpcSerializedPageHashes_Enum)
+# define RTCrSpcSerializedPageHashes_UpdateDerivedData  RT_MANGLER(RTCrSpcSerializedPageHashes_UpdateDerivedData)
 # define RTCrSpcString_Compare                          RT_MANGLER(RTCrSpcString_Compare)
 # define RTCrSpcString_Delete                           RT_MANGLER(RTCrSpcString_Delete)