Changeset 74760 in vbox for trunk/src/VBox/Runtime/tools/RTSignTool.cpp

Timestamp:

Oct 11, 2018 11:25:24 AM (6 years ago)

Author:

vboxsync

Message:

IPRT/ldr/asn1/pkcs7: Ironed out issues in decoding indefinite ASN.1 length records and successfully verified the first Mach-O signature. bugref:9232

File:

• trunk/src/VBox/Runtime/tools/RTSignTool.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/tools/RTSignTool.cpp

@@ -1371 +1371 @@
 static DECLCALLBACK(int) VerifyExeCallback(RTLDRMOD hLdrMod, RTLDRSIGNATURETYPE enmSignature,
                                            void const *pvSignature, size_t cbSignature,
+                                           void const *pvExternalData, size_t cbExternalData,
                                            PRTERRINFO pErrInfo, void *pvUser)
 {
@@ -1396 +1397 @@
              * the authenticode policies into account.
              */
+            if (pvExternalData)
+                return RTCrPkcs7VerifySignedDataWithExternalData(pContentInfo,
+                                                                 RTCRPKCS7VERIFY_SD_F_COUNTER_SIGNATURE_SIGNING_TIME_ONLY
+                                                                 | RTCRPKCS7VERIFY_SD_F_ALWAYS_USE_SIGNING_TIME_IF_PRESENT
+                                                                 | RTCRPKCS7VERIFY_SD_F_ALWAYS_USE_MS_TIMESTAMP_IF_PRESENT,
+                                                                 pState->hAdditionalStore, pState->hRootStore, &ValidationTime,
+                                                                 VerifyExecCertVerifyCallback, pState,
+                                                                 pvExternalData, cbExternalData, pErrInfo);
             return RTCrPkcs7VerifySignedData(pContentInfo,
                                              RTCRPKCS7VERIFY_SD_F_COUNTER_SIGNATURE_SIGNING_TIME_ONLY