Changeset 95220 in vbox

Timestamp:

Jun 8, 2022 7:47:46 AM (3 years ago)

Author:

vboxsync

Message:

libs/openssl: Removed openssl 1.1.1l now that we fully switched to the 3.x series, bugref:10128

Location:

trunk

Files:

• Config.kmk (modified) (4 diffs)
• src/libs/Makefile.kmk (modified) (1 diff)
• src/libs/openssl-1.1.1l (deleted)

trunk/Config.kmk

@@ -948 +948 @@
 ## @name Misc
 ## @{
-# Enable to compile with OpenSSL 1.0 (only relevant for Windows, see src/VBox/Runtime/Makefile.kmk)
-#VBOX_WITH_OPENSSL_PRE_1_1 = 1
-# Enable openssl 3.0.1 (temporary to not break everything at once @bugref{10128}).
-if1of ($(KBUILD_TARGET), solaris linux darwin win)
- VBOX_WITH_OPENSSL3 = 1
-endif
 # Enables all the doxgen bits.
 VBOX_WITH_ALL_DOXYGEN_TARGETS = 1
@@ -1422 +1416 @@
  VBOX_WITH_DXVK=
  VBOX_WITH_3D_ACCELERATION=
- # openssl 3 support not available in OSE yet
- VBOX_WITH_OPENSSL3=
  if1of ($(KBUILD_TARGET), win)
   # tar/gzip uncommon on Windows
@@ -4766 +4758 @@
 # openssl
 SDK_VBOX_OPENSSL                        := OpenSSL - Only for VBoxRT and/or statically linked programs.
-if defined(VBOX_WITH_OPENSSL3)
- SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS     := $(PATH_OUT)/obj/crypto-3.0.3-headers/include
-else
- SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS     := $(PATH_OUT)/obj/crypto-1.1.1-headers/include
-endif
+SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS      := $(PATH_OUT)/obj/crypto-3.0.3-headers/include
 SDK_VBOX_OPENSSL_INCS                   ?= $(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)
 SDK_VBOX_OPENSSL_ORDERDEPS              ?= $(crypto-headers_1_TARGET)
@@ -4784 +4772 @@
 
 SDK_VBOX_OPENSSL-x86                    := OpenSSL/x86 - Only for VBoxRT and/or statically linked programs.
-if defined(VBOX_WITH_OPENSSL3)
- SDK_VBOX_OPENSSL-x86_VBOX_DEFAULT_INCS := $(PATH_OUT)/obj/crypto-3.0.3-headers/include
-else
- SDK_VBOX_OPENSSL-x86_VBOX_DEFAULT_INCS := $(PATH_OUT)/obj/crypto-1.1.1-headers/include
-endif
+SDK_VBOX_OPENSSL-x86_VBOX_DEFAULT_INCS  := $(PATH_OUT)/obj/crypto-3.0.3-headers/include
 SDK_VBOX_OPENSSL-x86_INCS               ?= $(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)
 SDK_VBOX_OPENSSL-x86_ORDERDEPS          ?= $(crypto-headers_1_TARGET)

trunk/src/libs/Makefile.kmk

@@ -90 +90 @@
  && (!defined(VBOX_ONLY_EXTPACKS) || defined(VBOX_NEED_EXTPACK_OPENSSL) || !defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS)) \
  && ("$(SDK_VBOX_OPENSSL_INCS)" == "$(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)" || defined(VBOX_NEED_EXTPACK_OPENSSL))
- ifdef VBOX_WITH_OPENSSL3
   include $(PATH_SUB_CURRENT)/openssl-3.0.3/Makefile.kmk
- else
-  include $(PATH_SUB_CURRENT)/openssl-1.1.1l/Makefile.kmk
- endif
 endif