Changeset 94099 in vbox for trunk/src

Timestamp:

Mar 6, 2022 4:21:12 PM (3 years ago)

Author:

vboxsync

Message:

libs/openssl-3.0.1: Fixes for Config.kmk, bugref:10128

File:

• trunk/src/libs/openssl-3.0.1/Config.kmk (modified) (10 diffs)

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

@@ -40 +40 @@
 VBOX_PATH_CRYPTO_DES        := $(VBOX_PATH_CRYPTO)/des
 VBOX_PATH_CRYPTO_CAMELLIA   := $(VBOX_PATH_CRYPTO)/camellia
-VBOX_INST_CRYPTO_HEADERS    := obj/$(if-expr "$(CURSUBDIR)" == ".",,$(CURSUBDIR)/)crypto-1.1.1-headers/include/openssl/
+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))
 
@@ -63 +63 @@
 crypto-headers_SOURCES = \
         include/openssl/aes.h=>aes.h \
-        include/openssl/asn1.h=>asn1.h \
         include/openssl/asn1err.h=>asn1err.h \
-        include/openssl/asn1t.h=>asn1t.h \
         include/openssl/asn1_mac.h=>asn1_mac.h \
         include/openssl/async.h=>async.h \
         include/openssl/asyncerr.h=>asyncerr.h \
-        include/openssl/bio.h=>bio.h \
         include/openssl/bioerr.h=>bioerr.h \
         include/openssl/blowfish.h=>blowfish.h \
@@ -79 +76 @@
         include/openssl/cast.h=>cast.h \
         include/openssl/cmac.h=>cmac.h \
-        include/openssl/cms.h=>cms.h \
         include/openssl/cmserr.h=>cmserr.h \
         include/openssl/comp.h=>comp.h \
         include/openssl/comperr.h=>comperr.h \
-        include/openssl/conf.h=>conf.h \
         include/openssl/conferr.h=>conferr.h \
         include/openssl/conf_api.h=>conf_api.h \
-        include/openssl/crypto.h=>crypto.h \
         include/openssl/cryptoerr.h=>cryptoerr.h \
-        include/openssl/ct.h=>ct.h \
         include/openssl/cterr.h=>cterr.h \
         include/openssl/des.h=>des.h \
@@ -102 +95 @@
         include/openssl/ecdsa.h=>ecdsa.h \
         include/openssl/engine.h=>engine.h \
-        include/openssl/err.h=>err.h \
         include/openssl/evp.h=>evp.h \
         include/openssl/evperr.h=>evperr.h \
@@ -108 +100 @@
         include/openssl/hmac.h=>hmac.h \
         include/openssl/idea.h=>idea.h \
-        include/openssl/lhash.h=>lhash.h \
         include/openssl/md2.h=>md2.h \
         include/openssl/md4.h=>md4.h \
@@ -117 +108 @@
         include/openssl/objectserr.h=>objectserr.h \
         include/openssl/obj_mac.h=>obj_mac.h \
-        include/openssl/ocsp.h=>ocsp.h \
-        include/openssl/ocsperr.h=>ocsperr.h \
         openssl-mangling.h=>openssl-mangling.h \
         include/openssl/opensslconf.h=>opensslconf.h \
-        include/openssl/opensslv.h=>opensslv.h \
         include/openssl/ossl_typ.h=>ossl_typ.h \
         include/openssl/pem.h=>pem.h \
         include/openssl/pemerr.h=>pemerr.h \
         include/openssl/pem2.h=>pem2.h \
-        include/openssl/pkcs12.h=>pkcs12.h \
         include/openssl/pkcs12err.h=>pkcs12err.h \
-        include/openssl/pkcs7.h=>pkcs7.h \
         include/openssl/pkcs7err.h=>pkcs7err.h \
         include/openssl/rand.h=>rand.h \
@@ -137 +123 @@
         include/openssl/rsa.h=>rsa.h \
         include/openssl/rsaerr.h=>rsaerr.h \
-        include/openssl/safestack.h=>safestack.h \
         include/openssl/seed.h=>seed.h \
         include/openssl/sha.h=>sha.h \
-        include/openssl/srp.h=>srp.h \
         include/openssl/srtp.h=>srtp.h \
-        include/openssl/ssl.h=>ssl.h \
         include/openssl/sslerr.h=>sslerr.h \
         include/openssl/ssl2.h=>ssl2.h \
@@ -151 +134 @@
         include/openssl/ts.h=>ts.h \
         include/openssl/txt_db.h=>txt_db.h \
-        include/openssl/ui.h=>ui.h \
-        include/openssl/x509.h=>x509.h \
         include/openssl/x509err.h=>x509err.h \
-        include/openssl/x509v3.h=>x509v3.h \
         include/openssl/x509v3err.h=>x509v3err.h \
-        include/openssl/x509_vfy.h=>x509_vfy.h
-
-
+        gen-includes/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/openssl/asn1.h=>asn1.h \
+        gen-includes/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/openssl/asn1t.h=>asn1t.h \
+        gen-includes/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/openssl/bio.h=>bio.h \
+        gen-includes/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/openssl/cmp.h=>cmp.h \
+        gen-includes/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/openssl/cms.h=>cms.h \
+        gen-includes/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/openssl/conf.h=>conf.h \
+        gen-includes/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/openssl/configuration.h=>configuration.h \
+        gen-includes/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/openssl/crmf.h=>crmf.h \
+        gen-includes/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/openssl/crypto.h=>crypto.h \
+        gen-includes/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/openssl/ct.h=>ct.h \
+        gen-includes/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/openssl/err.h=>err.h \
+        gen-includes/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/openssl/ess.h=>ess.h \
+        gen-includes/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/openssl/fipskey.h=>fipskey.h \
+        gen-includes/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/openssl/lhash.h=>lhash.h \
+        gen-includes/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/openssl/ocsp.h=>ocsp.h \
+        gen-includes/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/openssl/opensslv.h=>opensslv.h \
+        gen-includes/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/openssl/pkcs12.h=>pkcs12.h \
+        gen-includes/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/openssl/pkcs7.h=>pkcs7.h \
+        gen-includes/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/openssl/safestack.h=>safestack.h \
+        gen-includes/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/openssl/srp.h=>srp.h \
+        gen-includes/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/openssl/ssl.h=>ssl.h \
+        gen-includes/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/openssl/ui.h=>ui.h \
+        gen-includes/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/openssl/x509.h=>x509.h \
+        gen-includes/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/openssl/x509_vfy.h=>x509_vfy.h \
+        gen-includes/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/openssl/x509v3.h=>x509v3.h
 
 #
@@ -182 +184 @@
         OPENSSL_USE_NODELETE \
         OPENSSL_PIC \
-        OPENSSL_IA32_SSE2
+        OPENSSL_IA32_SSE2 \
+        OPENSSL_BUILDING_OPENSSL
 ifdef VBOX_WITH_CRYPTO_ASM
 TEMPLATE_LIBCRYPTO_DEFS += \
@@ -266 +269 @@
         $(VBOX_PATH_OPENSSL) \
         $(VBOX_PATH_OPENSSL)/include \
+        $(VBOX_PATH_OPENSSL)/providers/common/include \
+        $(VBOX_PATH_OPENSSL)/providers/implementations/include \
         $(VBOX_PATH_CRYPTO)/include \
         $(VBOX_PATH_CRYPTO_MODES) \