Changeset 80953 in vbox

Timestamp:

Sep 23, 2019 3:48:44 PM (6 years ago)

Author:

vboxsync

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

133536

Message:

EFI/Firmware: Import the openssl sources from the vendor branch so the iSCSI DXE driver can be enabled again, bugref:4643

Location:

trunk/src/VBox/Devices/EFI/Firmware

Files:

trunk/src/VBox/Devices/EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLib.inf

r80721	r80953
16	16	LIBRARY_CLASS = OpensslLib
17	17	DEFINE OPENSSL_PATH = openssl
18		DEFINE OPENSSL_FLAGS = -DL_ENDIAN -DOPENSSL_SMALL_FOOTPRINT -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
	18	DEFINE OPENSSL_FLAGS = -DL_ENDIAN -DOPENSSL_SMALL_FOOTPRINT -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DDSO_NONE
19	19
20	20	#

r80721	r80953
16	16	LIBRARY_CLASS = OpensslLib
17	17	DEFINE OPENSSL_PATH = openssl
18		DEFINE OPENSSL_FLAGS = -DL_ENDIAN -DOPENSSL_SMALL_FOOTPRINT -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
	18	DEFINE OPENSSL_FLAGS = -DL_ENDIAN -DOPENSSL_SMALL_FOOTPRINT -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DDSO_NONE
19	19
20	20	#

-              r80721
+              r80953
+  )
+{
+#ifndef VBOX
   BOOLEAN     Ret;
+#else
+  BOOLEAN     Ret = 0; // MSFT thinks it can be used uninitialized
+#endif
   UINT8       RandByte[16];
   UINT8       Key[16];

r80935	r80953
219	219	-D VBOX_WITH_OVMF=1 \
220	220	-D BUILD_NEW_SHELL=1 \
221		~~-D NETWORK_ISCSI_ENABLE=0 \~~
222	221	-D VBOX_REV=$(VBOX_SVN_REV) \
223	222	-D "VBOX_OUTPUT_BASE_DIR=$(VBoxEfiFirmware_0_OUTDIR)" \

-              r80921
+              r80953
   IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
-!ifndef $(VBOX)
 !if $(NETWORK_TLS_ENABLE) == TRUE
   OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
 !else
   OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
-!endif
 !endif

Note: See TracChangeset for help on using the changeset viewer.