Changeset 94109 in vbox

Timestamp:

Mar 7, 2022 12:21:37 PM (3 years ago)

Author:

vboxsync

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

150358

Message:

libs/openssl-3.0.1: Build providers and include in libcrypto, requires pre-generating a bunch of source files with a prel script, bugref:10128

Location:

trunk/src/libs/openssl-3.0.1

Files:

• Config.kmk (modified) (3 diffs)
• Makefile.kmk (modified) (2 diffs)
• crypto/Makefile.kmk (modified) (2 diffs)

trunk/src/libs/openssl-3.0.1/Config.kmk

@@ -42 +42 @@
 VBOX_INST_CRYPTO_HEADERS    := obj/$(if-expr "$(CURSUBDIR)" == ".",,$(CURSUBDIR)/)crypto-3.0.1-headers/include/openssl/
 VBOX_PATH_CRYPTO_HEADERS    := $(abspath $(PATH_OUT))/$(patsubst %/,%,$(VBOX_INST_CRYPTO_HEADERS))
+VBOX_PATH_CRYPTO_PROVIDERS  := $(VBOX_PATH_OPENSSL)/providers
 
 # Enable asm implementation of crypto.
@@ -208 +209 @@
         VPAES_ASM \
         ECP_NISTZ256_ASM \
-        PADLOCK_ASM \
-        POLY1305_ASM
+        PADLOCK_ASM
+#       POLY1305_ASM @todo Later
 TEMPLATE_LIBCRYPTO_DEFS.amd64 = \
         BSAES_ASM \
@@ -281 +282 @@
         $(VBOX_PATH_OPENSSL)/providers/common/include \
         $(VBOX_PATH_OPENSSL)/providers/implementations/include \
+        $(VBOX_PATH_OPENSSL)/gen-includes/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) \
         $(VBOX_PATH_CRYPTO)/include \
         $(VBOX_PATH_CRYPTO_MODES) \

trunk/src/libs/openssl-3.0.1/Makefile.kmk

@@ -19 +19 @@
 endif
 
+VBOX_OSSL_TARGETS := linux.amd64
+
 # Include sub-makefiles.
+include $(PATH_SUB_CURRENT)/providers/Makefile.kmk
 include $(PATH_SUB_CURRENT)/crypto/Makefile.kmk
 include $(PATH_SUB_CURRENT)/ssl/Makefile.kmk
@@ -62 +65 @@
 #
 recreate-headers: $(PATH_SUB_CURRENT)/util/dofile.pl \
-        $(OSSL_HDR_TEMPLATES)
-        $(foreach target, linux.amd64, \
+        $(OSSL_HDR_TEMPLATES) \
+        recreate-providers-headers
+        $(foreach target, $(VBOX_OSSL_TARGETS), \
                 $(foreach header, $(OSSL_HDR_TEMPLATES), \
                     perl -I$(PATH_SUB_CURRENT)/gen-includes/$(target) \

trunk/src/libs/openssl-3.0.1/crypto/Makefile.kmk

@@ -102 +102 @@
 endif
 
+VBox-libcrypto_SOURCES += $(PATH_STAGE_LIB)/VBox-libproviders$(VBOX_SUFF_LIB)
+
 if defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS)
  VBox-libcrypto_SOURCES += $(crypto_sha_1_TARGET)
@@ -117 +119 @@
  VBox-libcrypto-x86_EXTENDS = VBox-libcrypto
  VBox-libcrypto-x86_SOURCES = $(filter %.c %.cpp,$(VBox-libcrypto_SOURCES)) \
+        $(PATH_STAGE_LIB)/VBox-libproviders-x86$(VBOX_SUFF_LIB)
         $(foreach sublib,$(VBOX_CRYPTO_SUBLIBS_X86), $($(sublib)_1_TARGET))
 endif