From ffe048a0807b56c2def74f8280d55e2aa8865c20 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Mon, 24 Jun 2019 18:30:27 +0200 Subject: ArmVirtPkg: handle NETWORK_TLS_ENABLE in ArmVirtQemu* Port the [LibraryClasses], [PcdsFixedAtBuild] and [Components] settings that are related to NETWORK_TLS_ENABLE from OvmfPkg to ArmVirtPkg. ArmVirtXen is not modified because it doesn't include the edk2 network stack. (This change is now simpler than it would have been when TianoCore#1009 was originally filed, due to ArmVirtPkg consuming the NetworkPkg include fragments meanwhile, from TianoCore#1293 / commit 157a3b1aa50f.) The usage hints from "OvmfPkg/README", section "HTTPS Boot", apply. Cc: Ard Biesheuvel Cc: Gary Lin Cc: Guillaume GARDET Cc: Julien Grall Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1009 Signed-off-by: Laszlo Ersek Reviewed-by: Ard Biesheuvel Reviewed-by: Guillaume Gardet Reviewed-by: Philippe Mathieu-Daude Tested-by: Gary Lin --- ArmVirtPkg/ArmVirt.dsc.inc | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'ArmVirtPkg/ArmVirt.dsc.inc') diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc index 20bf011617..a4ae25d982 100644 --- a/ArmVirtPkg/ArmVirt.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc @@ -71,6 +71,9 @@ # Networking Requirements !include NetworkPkg/NetworkLibs.dsc.inc +!if $(NETWORK_TLS_ENABLE) == TRUE + TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf +!endif # @@ -136,7 +139,11 @@ # CryptoPkg libraries needed by multiple firmware features # IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf +!if $(NETWORK_TLS_ENABLE) == TRUE + OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf +!else OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf +!endif BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf # -- cgit v1.2.3