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

Timestamp:

Jul 13, 2022 11:07:00 PM (2 years ago)

Author:

vboxsync

Message:

RTSignTool: Made sign-exe work for unsigned files. bugref:8691

File:

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

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

@@ -645 +645 @@
 
 /**
- * Reads and decodes PKCS\#7 signature from the given executable.
+ * Reads and decodes PKCS\#7 signature from the given executable, if it has one.
  *
  * @returns RTEXITCODE_SUCCESS on success, RTEXITCODE_FAILURE with error message
@@ -653 +653 @@
  * @param   cVerbosity          The verbosity.
  * @param   enmLdrArch          For FAT binaries.
+ * @param   fAllowUnsigned      Whether to allow unsigned binaries.
  */
-static RTEXITCODE SignToolPkcs7Exe_InitFromFile(PSIGNTOOLPKCS7EXE pThis, const char *pszFilename,
-                                                unsigned cVerbosity, RTLDRARCH enmLdrArch = RTLDRARCH_WHATEVER)
+static RTEXITCODE SignToolPkcs7Exe_InitFromFile(PSIGNTOOLPKCS7EXE pThis, const char *pszFilename, unsigned cVerbosity,
+                                                RTLDRARCH enmLdrArch = RTLDRARCH_WHATEVER, bool fAllowUnsigned = false)
 {
     /*
@@ -722 +723 @@
         }
         else if (RT_SUCCESS(rc))
-            RTMsgInfo("'%s': not signed\n", pszFilename);
+        {
+            if (!fAllowUnsigned || cVerbosity >= 2)
+                RTMsgInfo("'%s': not signed\n", pszFilename);
+            if (fAllowUnsigned)
+                return RTEXITCODE_SUCCESS;
+        }
         else
             RTMsgError("RTLdrQueryProp/RTLDRPROP_IS_SIGNED failed on '%s': %Rrc\n", pszFilename, rc);
@@ -851 +857 @@
                                 RTMsgError("Error truncating file to %#x bytes: %Rrc", pSecDir->VirtualAddress, rc);
                         }
-                        else
+                        else if (pSecDir->Size != 0 && pSecDir->VirtualAddress == 0)
                             rc = RTMsgErrorRc(VERR_BAD_EXE_FORMAT, "Bad security directory entry: VA=%#x Size=%#x",
                                               pSecDir->VirtualAddress, pSecDir->Size);
@@ -2405 +2411 @@
                     /* Do the work: */
                     SIGNTOOLPKCS7EXE Exe;
-                    /** @todo will fail if not already signed. */
-                    rcExit2 = SignToolPkcs7Exe_InitFromFile(&Exe, ValueUnion.psz, cVerbosity);
+                    rcExit2 = SignToolPkcs7Exe_InitFromFile(&Exe, ValueUnion.psz, cVerbosity,
+                                                            RTLDRARCH_WHATEVER, true /*fAllowUnsigned*/);
                     if (rcExit2 == RTEXITCODE_SUCCESS)
                     {