Changeset 95612 in vbox for trunk/src/VBox/Runtime/common/ldr

Timestamp:

Jul 13, 2022 12:51:28 AM (3 years ago)

Author:

vboxsync

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

152252

Message:

IPRT/ldr: Changed RTLdrHashImage to return the hash rather than the digest string. bugref:8691

Location:

trunk/src/VBox/Runtime/common/ldr

Files:

• ldrEx.cpp (modified) (5 diffs)
• ldrPE.cpp (modified) (2 diffs)

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

@@ -629 +629 @@
             break;
         case RTLDRPROP_PKCS7_SIGNED_DATA:
+        case RTLDRPROP_SHA1_PAGE_HASHES:
+        case RTLDRPROP_SHA256_PAGE_HASHES:
             *pcbRet = 0;
+            break;
+        case RTLDRPROP_HASHABLE_PAGES:
+            *pcbRet = sizeof(uint32_t);
+            AssertReturn(cbBuf >= sizeof(uint32_t), VERR_INVALID_PARAMETER);
             break;
         case RTLDRPROP_SIGNATURE_CHECKS_ENFORCED:
@@ -693 +699 @@
 
 
-RTDECL(int) RTLdrHashImage(RTLDRMOD hLdrMod, RTDIGESTTYPE enmDigest, char *pszDigest, size_t cbDigest)
+RTDECL(int) RTLdrHashImage(RTLDRMOD hLdrMod, RTDIGESTTYPE enmDigest, uint8_t *pabHash, size_t cbHash)
 {
     AssertMsgReturn(rtldrIsValid(hLdrMod), ("hLdrMod=%p\n", hLdrMod), VERR_INVALID_HANDLE);
@@ -704 +710 @@
     switch (enmDigest)
     {
-        case RTDIGESTTYPE_MD5:      AssertReturn(cbDigest >= RTMD5_DIGEST_LEN    + 1, VERR_BUFFER_OVERFLOW); break;
-        case RTDIGESTTYPE_SHA1:     AssertReturn(cbDigest >= RTSHA1_DIGEST_LEN   + 1, VERR_BUFFER_OVERFLOW); break;
-        case RTDIGESTTYPE_SHA256:   AssertReturn(cbDigest >= RTSHA256_DIGEST_LEN + 1, VERR_BUFFER_OVERFLOW); break;
-        case RTDIGESTTYPE_SHA512:   AssertReturn(cbDigest >= RTSHA512_DIGEST_LEN + 1, VERR_BUFFER_OVERFLOW); break;
+        case RTDIGESTTYPE_MD5:      AssertReturn(cbHash >= RTMD5_HASH_SIZE,    VERR_BUFFER_OVERFLOW); break;
+        case RTDIGESTTYPE_SHA1:     AssertReturn(cbHash >= RTSHA1_HASH_SIZE,   VERR_BUFFER_OVERFLOW); break;
+        case RTDIGESTTYPE_SHA256:   AssertReturn(cbHash >= RTSHA256_HASH_SIZE, VERR_BUFFER_OVERFLOW); break;
+        case RTDIGESTTYPE_SHA512:   AssertReturn(cbHash >= RTSHA512_HASH_SIZE, VERR_BUFFER_OVERFLOW); break;
         default:
             if (enmDigest > RTDIGESTTYPE_INVALID && enmDigest < RTDIGESTTYPE_END)
@@ -713 +719 @@
             AssertFailedReturn(VERR_INVALID_PARAMETER);
     }
-    AssertPtrReturn(pszDigest, VERR_INVALID_POINTER);
+    AssertPtrReturn(pabHash, VERR_INVALID_POINTER);
 
     /*
@@ -720 +726 @@
     if (!pMod->pOps->pfnHashImage)
         return VERR_NOT_SUPPORTED;
-    return pMod->pOps->pfnHashImage(pMod, enmDigest, pszDigest, cbDigest);
+    return pMod->pOps->pfnHashImage(pMod, enmDigest, pabHash, cbHash);
 }
 RT_EXPORT_SYMBOL(RTLdrHashImage);

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

@@ -3160 +3160 @@
  * @interface_method_impl{RTLDROPS,pfnHashImage}
  */
-static DECLCALLBACK(int) rtldrPE_HashImage(PRTLDRMODINTERNAL pMod, RTDIGESTTYPE enmDigest, char *pszDigest, size_t cbDigest)
+static DECLCALLBACK(int) rtldrPE_HashImage(PRTLDRMODINTERNAL pMod, RTDIGESTTYPE enmDigest, uint8_t *pabHash, size_t cbHash)
 {
     PRTLDRMODPE pModPe = (PRTLDRMODPE)pMod;
@@ -3186 +3186 @@
     {
         /*
-         * Format the digest into as human readable hash string.
+         * Copy out the result.
          */
+        RT_NOREF(cbHash); /* verified by caller */
         switch (enmDigest)
         {
-            case RTDIGESTTYPE_SHA512:  rc = RTSha512ToString(HashRes.abSha512, pszDigest, cbDigest); break;
-            case RTDIGESTTYPE_SHA256:  rc = RTSha256ToString(HashRes.abSha256, pszDigest, cbDigest); break;
-            case RTDIGESTTYPE_SHA1:    rc = RTSha1ToString(HashRes.abSha1, pszDigest, cbDigest); break;
-            case RTDIGESTTYPE_MD5:     rc = RTMd5ToString(HashRes.abMd5, pszDigest, cbDigest); break;
+            case RTDIGESTTYPE_SHA512:  memcpy(pabHash, HashRes.abSha512, sizeof(HashRes.abSha512)); break;
+            case RTDIGESTTYPE_SHA256:  memcpy(pabHash, HashRes.abSha256, sizeof(HashRes.abSha256)); break;
+            case RTDIGESTTYPE_SHA1:    memcpy(pabHash, HashRes.abSha1,   sizeof(HashRes.abSha1)); break;
+            case RTDIGESTTYPE_MD5:     memcpy(pabHash, HashRes.abMd5,    sizeof(HashRes.abMd5)); break;
             default:                   AssertFailedReturn(VERR_INTERNAL_ERROR_3);
         }