Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use correct Openssl inf for SBSA #625

Merged
merged 4 commits into from
Jul 7, 2023
Merged

Use correct Openssl inf for SBSA #625

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3d58d77
Updated the version of openssl used in sbsa to be correct to pass bas…
kenlautner Jul 5, 2023
a9f1deb
Merge branch 'main' into personal/klautner/use_correct_openssl_version
kenlautner Jul 6, 2023
09d4969
Disabled Network ISCSI so that we don't use MD5 Hashing
kenlautner Jul 6, 2023
dca0277
Merge branch 'main' into personal/klautner/use_correct_openssl_version
kenlautner Jul 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Platforms/QemuSbsaPkg/QemuSbsaPkg.dsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
DEFINE NETWORK_SNP_ENABLE = FALSE
DEFINE NETWORK_TLS_ENABLE = FALSE
DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS = TRUE
DEFINE NETWORK_ISCSI_ENABLE = TRUE
DEFINE NETWORK_ISCSI_ENABLE = FALSE

!if $(NETWORK_SNP_ENABLE) == TRUE
!error "NETWORK_SNP_ENABLE is IA32/X64/EBC only"
Expand Down Expand Up @@ -205,7 +205,7 @@
#
IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
!if $(NETWORK_TLS_ENABLE) == TRUE
OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibFull.inf
!else
OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
!endif
Expand Down Expand Up @@ -494,7 +494,7 @@
MemoryAllocationLib|StandaloneMmPkg/Library/StandaloneMmMemoryAllocationLib/StandaloneMmMemoryAllocationLib.inf
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibFull.inf
RngLib|MdePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf
SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
Expand Down Expand Up @@ -1201,7 +1201,7 @@
CryptoPkg/Test/UnitTest/Library/BaseCryptLib/BaseCryptLibUnitTestApp.inf {
<LibraryClasses>
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf # Contains openSSL library used by BaseCryptoLib
OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibFull.inf # Contains openSSL library used by BaseCryptoLib
IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
<PcdsPatchableInModule>
#Turn off Halt on Assert and Print Assert so that libraries can
Expand Down
Loading