From bd7fecb526fba849cd0fb0702f2614fe60649836 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Thu, 6 Apr 2017 22:23:35 +0200 Subject: [PATCH] OvmfPkg: add USE_EXTERNAL_OPENSSL for external, binary OpenSSL Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek --- OvmfPkg/OvmfPkgIa32.dsc | 8 ++++++++ OvmfPkg/OvmfPkgIa32X64.dsc | 8 ++++++++ OvmfPkg/OvmfPkgX64.dsc | 8 ++++++++ 3 files changed, 24 insertions(+) diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index 6f515c9aa1aa..1eb635a68250 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -145,11 +145,19 @@ [LibraryClasses] DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf +!ifdef $(USE_EXTERNAL_OPENSSL) +!if $(TLS_ENABLE) == TRUE + OpensslLib|ExternalSslPkg/Library/OpensslLib/OpensslLibBin.inf +!else + OpensslLib|ExternalSslPkg/Library/OpensslLib/OpensslLibBinCrypto.inf +!endif +!else !if $(TLS_ENABLE) == TRUE OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf !else OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf !endif +!endif !if $(SECURE_BOOT_ENABLE) == TRUE PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index 7d1676d122b7..06d29a73313f 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -150,11 +150,19 @@ [LibraryClasses] DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf +!ifdef $(USE_EXTERNAL_OPENSSL) +!if $(TLS_ENABLE) == TRUE + OpensslLib|ExternalSslPkg/Library/OpensslLib/OpensslLibBin.inf +!else + OpensslLib|ExternalSslPkg/Library/OpensslLib/OpensslLibBinCrypto.inf +!endif +!else !if $(TLS_ENABLE) == TRUE OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf !else OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf !endif +!endif !if $(SECURE_BOOT_ENABLE) == TRUE PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index f288c8c98536..94b70290fcf7 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -150,11 +150,19 @@ [LibraryClasses] DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf +!ifdef $(USE_EXTERNAL_OPENSSL) +!if $(TLS_ENABLE) == TRUE + OpensslLib|ExternalSslPkg/Library/OpensslLib/OpensslLibBin.inf +!else + OpensslLib|ExternalSslPkg/Library/OpensslLib/OpensslLibBinCrypto.inf +!endif +!else !if $(TLS_ENABLE) == TRUE OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf !else OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf !endif +!endif !if $(SECURE_BOOT_ENABLE) == TRUE PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf -- 2.9.3