Changeset 99668 in vbox

Timestamp:

May 8, 2023 1:03:08 PM (19 months ago)

Author:

vboxsync

Message:

IPRT/ldrPE: Added support for SHA384 image signatures. bugref:10439

File:

• trunk/src/VBox/Runtime/common/ldr/ldrPE.cpp (modified) (7 diffs)

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

@@ -191 +191 @@
 {
     RTSHA512CONTEXT Sha512;
+    RTSHA384CONTEXT Sha384;
     RTSHA256CONTEXT Sha256;
     RTSHA1CONTEXT   Sha1;
@@ -205 +206 @@
 {
     uint8_t abSha512[RTSHA512_HASH_SIZE];
+    uint8_t abSha384[RTSHA384_HASH_SIZE];
     uint8_t abSha256[RTSHA256_HASH_SIZE];
     uint8_t abSha1[RTSHA1_HASH_SIZE];
@@ -2181 +2183 @@
     {
         case RTDIGESTTYPE_SHA512:  RTSha512Init(&pHashCtx->Sha512); break;
+        case RTDIGESTTYPE_SHA384:  RTSha384Init(&pHashCtx->Sha384); break;
         case RTDIGESTTYPE_SHA256:  RTSha256Init(&pHashCtx->Sha256); break;
         case RTDIGESTTYPE_SHA1:    RTSha1Init(&pHashCtx->Sha1); break;
@@ -2203 +2206 @@
     {
         case RTDIGESTTYPE_SHA512:  RTSha512Update(&pHashCtx->Sha512, pvBuf, cbBuf); break;
+        case RTDIGESTTYPE_SHA384:  RTSha384Update(&pHashCtx->Sha384, pvBuf, cbBuf); break;
         case RTDIGESTTYPE_SHA256:  RTSha256Update(&pHashCtx->Sha256, pvBuf, cbBuf); break;
         case RTDIGESTTYPE_SHA1:    RTSha1Update(&pHashCtx->Sha1, pvBuf, cbBuf); break;
@@ -2223 +2227 @@
     {
         case RTDIGESTTYPE_SHA512:  RTSha512Final(&pHashCtx->Sha512, pHashRes->abSha512); break;
+        case RTDIGESTTYPE_SHA384:  RTSha384Final(&pHashCtx->Sha384, pHashRes->abSha384); break;
         case RTDIGESTTYPE_SHA256:  RTSha256Final(&pHashCtx->Sha256, pHashRes->abSha256); break;
         case RTDIGESTTYPE_SHA1:    RTSha1Final(&pHashCtx->Sha1, pHashRes->abSha1); break;
@@ -2242 +2247 @@
     {
         case RTDIGESTTYPE_SHA512:  return RTSHA512_HASH_SIZE;
+        case RTDIGESTTYPE_SHA384:  return RTSHA384_HASH_SIZE;
         case RTDIGESTTYPE_SHA256:  return RTSHA256_HASH_SIZE;
         case RTDIGESTTYPE_SHA1:    return RTSHA1_HASH_SIZE;
         case RTDIGESTTYPE_MD5:     return RTMD5_HASH_SIZE;
         default:                   AssertReleaseFailedReturn(0);
+    }
+}
+
+
+/**
+ * Checks if the hash type is supported.
+ *
+ * @returns true/false.
+ * @param   enmDigest           The hash type in question.
+ */
+static bool rtLdrPE_HashIsSupported(RTDIGESTTYPE enmDigest)
+{
+    switch (enmDigest)
+    {
+        case RTDIGESTTYPE_SHA512:
+        case RTDIGESTTYPE_SHA384:
+        case RTDIGESTTYPE_SHA256:
+        case RTDIGESTTYPE_SHA1:
+        case RTDIGESTTYPE_MD5:
+            return true;
+        default:
+            return false;
     }
 }
@@ -3247 +3275 @@
     AssertReturn(RTASN1CORE_IS_PRESENT(&pInfo->pIndData->DigestInfo.Digest.Asn1Core), VERR_INTERNAL_ERROR_5);
     AssertPtrReturn(pInfo->pIndData->DigestInfo.Digest.Asn1Core.uData.pv, VERR_INTERNAL_ERROR_5);
+
+    /* Check that the hash is supported by the code here before continuing. */
+    AssertReturn(rtLdrPE_HashIsSupported(pInfo->enmDigest),
+                 RTErrInfoSetF(pErrInfo, VERR_CR_DIGEST_NOT_SUPPORTED, "Unsupported digest type: %d", pInfo->enmDigest));
 
     /*