Changeset 71878 in vbox for trunk/src/VBox

Timestamp:

Apr 17, 2018 2:32:06 PM (7 years ago)

Author:

vboxsync

Message:

RTSignTool: Added a --prepend flag to the add-nested-cat-signature and add-nested-exe-signature, also fixed handling of more than 1 nested signature. [cleanup]

File:

• trunk/src/VBox/Runtime/tools/RTSignTool.cpp (modified) (1 diff)

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

@@ -433 +433 @@
         if (RT_SUCCESS(rc))
         {
-            //PRTCRPKCS7CONTENTINFO pCntInfo = pAttr->uValues.pContentInfos->papItems[iPos];
-            //rc = RTCrPkcs7ContentInfo_Clone(pCntInfo, &pSrc->ContentInfo, pAttr->Allocation.pAllocator);
-            if (RT_SUCCESS(rc))
+            if (cVerbosity > 0)
+                RTMsgInfo("Added nested signature (#%u)", iActualPos);
+            if (cVerbosity >= 3)
             {
-                if (cVerbosity > 0)
-                    RTMsgInfo("Added nested signature");
-                if (cVerbosity >= 3)
-                {
-                    RTMsgInfo("SingerInfo dump after change:");
-                    RTAsn1Dump(RTCrPkcs7SignerInfo_GetAsn1Core(pSignerInfo), 0, 2, RTStrmDumpPrintfV, g_pStdOut);
-                }
-
-                return RTEXITCODE_SUCCESS;
+                RTMsgInfo("SingerInfo dump after change:");
+                RTAsn1Dump(RTCrPkcs7SignerInfo_GetAsn1Core(pSignerInfo), 0, 2, RTStrmDumpPrintfV, g_pStdOut);
             }
-
-            RTMsgError("RTCrPkcs7ContentInfo_Clone failed: %Rrc", iPos);
-        }
-        else
-            RTMsgError("RTCrPkcs7ContentInfos_Append failed: %Rrc", iPos);
+            return RTEXITCODE_SUCCESS;
+        }
+
+        RTMsgError("RTCrPkcs7ContentInfos_InsertEx failed: %Rrc", rc);
     }
     return RTEXITCODE_FAILURE;