Changeset 95676 in vbox for trunk/src/VBox/Runtime/tools

Timestamp:

Jul 17, 2022 3:01:19 AM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

152325

Message:

/Config.kmk,openssl,RTSignTool: Build bldRTSignTool with signing capability on windows. bugref:8691

Location:

trunk/src/VBox/Runtime/tools

Files:

• Makefile.kmk (modified) (1 diff)
• RTSignTool.cpp (modified) (9 diffs)

trunk/src/VBox/Runtime/tools/Makefile.kmk

@@ -74 +74 @@
   # RTSignTool - Signing utility - build version.  Signed on windows so we can get the certificate from it.
   BLDPROGS += bldRTSignTool
-  bldRTSignTool_TEMPLATE := VBoxAdvBldProg
-  bldRTSignTool_INCS     := ../include
-  bldRTSignTool_SOURCES  := RTSignTool.cpp
-  bldRTSignTool_DEFS     := IPRT_IN_BUILD_TOOL
-  bldRTSignTool_LIBS.win := Crypt32.lib NCrypt.lib
+  bldRTSignTool_TEMPLATE  := VBoxAdvBldProg
+  bldRTSignTool_INCS      := ../include
+  bldRTSignTool_SOURCES   := RTSignTool.cpp
+  bldRTSignTool_DEFS      := IPRT_IN_BUILD_TOOL
+  bldRTSignTool_LIBS.win  := Crypt32.lib NCrypt.lib
   bldRTSignTool_POST_CMDS.win = $(VBOX_SIGN_IMAGE_CMDS)
   if defined(VBOX_WITH_DARWIN_R0_DARWIN_IMAGE_VERIFICATION) && defined(VBOX_SIGNING_MODE)
    bldRTSignTool_POST_CMDS.darwin = $(call VBOX_SIGN_MACHO_FN,$(out),org.virtualbox.org.bldtool.$(target))
+  endif
+  ifndef VBOX_WITH_BLD_RTSIGNTOOL_SIGNING
+   bldRTSignTool_DEFS     += IPRT_SIGNTOOL_NO_SIGNING
+  else # RuntimeBldProg is missing a lot and is built w/o IPRT_WITH_OPENSSL. So, include missing and rebuilt openssl deps.
+   bldRTSignTool_SDKS     += VBOX_OPENSSL_BLDPROG
+   bldRTSignTool_DEFS     += IPRT_WITH_OPENSSL
+   bldRTSignTool_SOURCES  += \
+       ../common/string/RTStrICmpAscii.cpp \
+        ../common/checksum/alt-sha3.cpp \
+       ../common/crypto/store-inmem.cpp \
+       ../common/crypto/store-cert-add-basic.cpp \
+       ../common/crypto/rsa-core.cpp \
+       ../common/crypto/rsa-asn1-decoder.cpp \
+       ../common/crypto/rsa-init.cpp \
+       ../common/crypto/rsa-sanity.cpp \
+       ../common/crypto/RTCrStoreCertAddFromJavaKeyStore.cpp \
+       ../common/crypto/pkix-signature-core.cpp \
+       ../common/crypto/pkix-signature-builtin.cpp \
+       ../common/crypto/pkix-signature-rsa.cpp \
+       \
+       ../common/crypto/store.cpp \
+       ../common/crypto/digest-builtin.cpp \
+        ../common/crypto/iprt-openssl.cpp\
+       ../common/crypto/key.cpp \
+       ../common/crypto/key-file.cpp \
+        ../common/crypto/key-openssl.cpp \
+        ../common/crypto/pkcs7-core.cpp \
+        ../common/crypto/pkcs7-sign.cpp \
+        ../common/crypto/RTCrRandBytes-openssl.cpp
+
   endif
  endif

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

@@ -1562 +1562 @@
 }
 
-#ifndef IPRT_IN_BUILD_TOOL
+#ifndef IPRT_SIGNTOOL_NO_SIGNING
 
 static PRTCRPKCS7ATTRIBUTE SignToolPkcs7_AuthAttribAppend(PRTCRPKCS7ATTRIBUTES pAuthAttribs)
@@ -2628 +2628 @@
 }
 
-#endif /* !IPRT_IN_BUILD_TOOL */
+#endif /* !IPRT_SIGNTOOL_NO_SIGNING */
 
 
@@ -3098 +3098 @@
 *   Option handlers shared by 'sign-exe', 'sign-cat', 'add-timestamp-exe-signature' and others.                                  *
 *********************************************************************************************************************************/
-#ifndef IPRT_IN_BUILD_TOOL
+#ifndef IPRT_SIGNTOOL_NO_SIGNING
 
 static RTEXITCODE HandleOptAddCert(PRTCRSTORE phStore, const char *pszFile)
@@ -3337 +3337 @@
 }
 
-#endif /* !IPRT_IN_BUILD_TOOL */
+#endif /* !IPRT_SIGNTOOL_NO_SIGNING */
 
 
@@ -3343 +3343 @@
 *   The 'add-timestamp-exe-signature' command.                                                                                   *
 *********************************************************************************************************************************/
-#ifndef IPRT_IN_BUILD_TOOL
+#ifndef IPRT_SIGNTOOL_NO_SIGNING
 
 static RTEXITCODE HelpAddTimestampExeSignature(PRTSTREAM pStrm, RTSIGNTOOLHELP enmLevel)
@@ -3448 +3448 @@
 }
 
-#endif /*!IPRT_IN_BUILD_TOOL */
+#endif /*!IPRT_SIGNTOOL_NO_SIGNING */
 
 
@@ -3454 +3454 @@
 *   The 'sign-exe' command.                                                                                   *
 *********************************************************************************************************************************/
-#ifndef IPRT_IN_BUILD_TOOL
+#ifndef IPRT_SIGNTOOL_NO_SIGNING
 
 static RTEXITCODE HelpSign(PRTSTREAM pStrm, RTSIGNTOOLHELP enmLevel)
@@ -3628 +3628 @@
 }
 
-#endif /*!IPRT_IN_BUILD_TOOL */
+#endif /*!IPRT_SIGNTOOL_NO_SIGNING */
 
 
@@ -5206 +5206 @@
     { "add-nested-exe-signature",       HandleAddNestedExeSignature,        HelpAddNestedExeSignature },
     { "add-nested-cat-signature",       HandleAddNestedCatSignature,        HelpAddNestedCatSignature },
-#ifndef IPRT_IN_BUILD_TOOL
+#ifndef IPRT_SIGNTOOL_NO_SIGNING
     { "add-timestamp-exe-signature",    HandleAddTimestampExeSignature,     HelpAddTimestampExeSignature },
     { "sign",                           HandleSign,                         HelpSign },