Changeset 51812 in vbox for trunk/src

Timestamp:

Jul 2, 2014 2:13:16 PM (11 years ago)

Author:

vboxsync

Message:

Fixed a pCert use that I'd missed (pCert / pTaInfo).

File:

• trunk/src/VBox/HostDrivers/Support/win/SUPHardenedVerifyImage-win.cpp (modified) (1 diff)

trunk/src/VBox/HostDrivers/Support/win/SUPHardenedVerifyImage-win.cpp

@@ -711 +711 @@
                     while ((pCertCtx = RTCrStoreCertSearchNext(g_hNtKernelRootStore, &Search)) != NULL)
                     {
-                        if (RTCrX509SubjectPublicKeyInfo_Compare(&pCertCtx->pCert->TbsCertificate.SubjectPublicKeyInfo,
-                                                                 pPublicKeyInfo) == 0)
+                        PCRTCRX509SUBJECTPUBLICKEYINFO pCertPubKeyInfo = NULL;
+                        if (pCertCtx->pCert)
+                            pCertPubKeyInfo = &pCertCtx->pCert->TbsCertificate.SubjectPublicKeyInfo;
+                        else if (pCertCtx->pTaInfo)
+                            pCertPubKeyInfo = &pCertCtx->pTaInfo->PubKey;
+                        else
+                            pCertPubKeyInfo = NULL;
+                        if (   pCertPubKeyInfo
+                            && RTCrX509SubjectPublicKeyInfo_Compare(pCertPubKeyInfo, pPublicKeyInfo) == 0)
                             cFound++;
                         RTCrCertCtxRelease(pCertCtx);