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

2405: Crypto Changes [Rebase & FF] #951

Merged
merged 13 commits into from
Jun 26, 2024
Merged

2405: Crypto Changes [Rebase & FF] #951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
cc149a1
Add Variable Argument List macros for VS
dmitryantipov Feb 1, 2018
2fc48b2
Base.h: Ignore VA macro Mu change when host tests are enabled
makubacki Feb 6, 2023
5a28bb1
TCBZ2029: Fix AARCH64 Crypto builds
Oct 4, 2019
8ccae26
Remove support for deprecated crypto from BaseCryptLib.
Jan 19, 2018
446be07
TCBZ2997: Use Non-Null CryptPkcs5Pbkdf2 for RuntimeCryptLib.inf
Oct 7, 2020
27f8a69
CryptoPkg: Add host-based unit testing
Mar 4, 2022
2fa1d93
NEEDTCBZ: Fix memory free bug in HmacTest
kenlautner Oct 1, 2021
363a8f6
[TCBZ3925] Correct the implementation of Pkcs7Sign
Apr 25, 2022
8e199ac
CryptoPkg: CodeQL Fixes
makubacki Sep 15, 2022
dce31bc
Transition to Latest Shared Crypto
makubacki Jun 25, 2024
76b368d
NetworkPkg: DSC changes for Shared Crypto
makubacki Jun 25, 2024
c6dad17
UefiCpuPkg: DSC changes for Shared Crypto
makubacki Jun 25, 2024
620c065
Revert "TEMP: Drop CryptoPkg from pipelines builds (until Shared Cryp…
makubacki Jun 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
22 changes: 9 additions & 13 deletions .azurepipelines/Ubuntu-GCC5.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,10 @@ extends:
Pkgs: 'UnitTestFrameworkPkg'
Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
ArchList: $(arch_list)
# TEMP_CHANGE [BEGIN]: Disable CryptoPkg build until Shared Crypto changes are in place
# TARGET_CRYPTO:
# Pkgs: 'CryptoPkg'
# Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
# ArchList: $(arch_list)
# TEMP_CHANGE [END]: Disable CryptoPkg build until Shared Crypto changes are in place
TARGET_CRYPTO:
Pkgs: 'CryptoPkg'
Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
ArchList: $(arch_list)
TARGET_MDE_CPU_ARM:
Pkgs: 'MdePkg,UefiCpuPkg'
Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
Expand Down Expand Up @@ -90,10 +88,8 @@ extends:
Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
ArchList: $(arch_list)
SelfHostAgent: true
# TEMP_CHANGE [BEGIN]: Disable CryptoPkg build until Shared Crypto changes are in place
# TARGET_CRYPTO_ARM:
# Pkgs: 'CryptoPkg'
# Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
# ArchList: $(arch_list)
# SelfHostAgent: true
# TEMP_CHANGE [END]: Disable CryptoPkg build until Shared Crypto changes are in place
TARGET_CRYPTO_ARM:
Pkgs: 'CryptoPkg'
Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
ArchList: $(arch_list)
SelfHostAgent: true
22 changes: 9 additions & 13 deletions .azurepipelines/Windows-VS.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,10 @@ extends:
Pkgs: 'PcAtChipsetPkg,ShellPkg,StandaloneMmPkg,BaseTools'
Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
ArchList: $(arch_list)
# TEMP_CHANGE [BEGIN]: Disable CryptoPkg build until Shared Crypto changes are in place
# TARGET_CRYPTO:
# Pkgs: 'CryptoPkg'
# Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
# ArchList: $(arch_list)
# TEMP_CHANGE [END]: Disable CryptoPkg build until Shared Crypto changes are in place
TARGET_CRYPTO:
Pkgs: 'CryptoPkg'
Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
ArchList: $(arch_list)
TARGET_MDE_CPU_ARM:
Pkgs: 'MdePkg,UefiCpuPkg'
Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
Expand Down Expand Up @@ -85,10 +83,8 @@ extends:
Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
ArchList: $(arch_list)
SelfHostAgent: true
# TEMP_CHANGE [BEGIN]: Disable CryptoPkg build until Shared Crypto changes are in place
# TARGET_CRYPTO_ARM:
# Pkgs: 'CryptoPkg'
# Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
# ArchList: $(arch_list)
# SelfHostAgent: true
# TEMP_CHANGE [END]: Disable CryptoPkg build until Shared Crypto changes are in place
TARGET_CRYPTO_ARM:
Pkgs: 'CryptoPkg'
Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
ArchList: $(arch_list)
SelfHostAgent: true
9 changes: 9 additions & 0 deletions CryptoPkg/Binaries/BaseCryptoDriver_ext_dep.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"scope": "global",
"type": "nuget",
"name": "edk2-basecrypto-driver-bin",
"source": "https://pkgs.dev.azure.com/projectmu/mu/_packaging/Mu-Public/nuget/v3/index.json",
"version": "2023.11.3",
Javagedes marked this conversation as resolved.
Show resolved Hide resolved
"flags": ["set_build_var"],
"var_name": "BLD_*_SHARED_CRYPTO_PATH"
}
94 changes: 21 additions & 73 deletions CryptoPkg/CryptoPkg.ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@
"DscPath": "CryptoPkg.dsc",
},
"LicenseCheck": {
"IgnoreFiles": [
# These directories contain auto-generated OpenSSL content
"Library/OpensslLib/OpensslGen"
]
# MU_CHANGE [BEGIN] Move to Shared Crypto
"IgnoreFiles": []
# MU_CHANGE [END] Move to Shared Crypto
},
"EccCheck": {
## Exception sample looks like below:
Expand All @@ -28,42 +27,18 @@
],
## Both file path and directory path are accepted.
"IgnoreFiles": [
"Library/OpensslLib/openssl",
"Library/OpensslLib/OpensslGen",
# MU_CHANGE [BEGIN] Move to Shared Crypto
# The unit testing folder is not to be checked
"Test/UnitTest",
# This has OpenSSL interfaces that aren't UEFI spec compliant
"Library/BaseCryptLib/SysCall",
# This has OpenSSL interfaces that aren't UEFI spec compliant
"Library/OpensslLib/OpensslStub",
# This has OpenSSL interfaces that aren't UEFI spec compliant
"Library/Include/CrtLibSupport.h",
# This has OpenSSL interfaces that aren't UEFI spec compliant
"Library/BaseCryptLib/Hash/CryptParallelHash.h",
"Library/Include/fcntl.h",
# This has Mbedtls interfaces that aren't UEFI spec compliant
"Library/Include/stdint.h",
"Library/Include/stubs-32.h",
"Library/Include/inttypes.h",
# These directories contain auto-generated OpenSSL content
"Library/OpensslLib",
"Library/IntrinsicLib",
"Library/BaseCryptLib/Pk/CryptPkcs7VerifyBase.c",
# mbedtls
"Library/MbedTlsLib/mbedtls",
# This has mbedtls interfaces that aren't UEFI spec compliant
"Library/MbedTlsLib/EcSm2Null.c",
"Library/MbedTlsLib/CrtWrapper.c",
"Library/MbedTlsLib/Include/mbedtls/mbedtls_config.h",
"Library/BaseCryptLibMbedTls/SysCall"
"Test/UnitTest"
# MU_CHANGE [END] Move to Shared Crypto
]
},
"CompilerPlugin": {
"DscPath": "CryptoPkg.dsc"
},
## options defined .pytool/Plugin/HostUnitTestCompilerPlugin
"HostUnitTestCompilerPlugin": {
"DscPath": "Test/CryptoPkgHostUnitTest.dsc"
#"DscPath": "Test/CryptoPkgHostUnitTest.dsc" # MU_CHANGE - Disable temporarily while transitioning crypto
},
"CharEncodingCheck": {
"IgnoreFiles": []
Expand All @@ -82,7 +57,11 @@
},
"DscCompleteCheck": {
"DscPath": "CryptoPkg.dsc",
"IgnoreInf": []
"IgnoreInf": [
## MU_CHANGE [BEGIN] Ignore Shared Crypto FIles
"CryptoPkg/Binaries/**"
## MU_CHANGE [END]
]
},
"GuidCheck": {
"IgnoreGuidName": [],
Expand All @@ -92,6 +71,12 @@
"LibraryClassCheck": {
"IgnoreHeaderFile": []
},
## MU_CHANGE [BEGIN] Disable AuditOnly
"MarkdownLintCheck": {
"AuditOnly": False, # If True, log all errors and then mark as skipped
makubacki marked this conversation as resolved.
Show resolved Hide resolved
"IgnoreFiles": [] # package root relative file, folder, or glob pattern to ignore
},
## MU_CHANGE [END] Disable AuditOnly

## options defined ci/Plugin/SpellCheck
"SpellCheck": {
Expand All @@ -105,46 +90,9 @@
# options defined in .pytool/Plugin/UncrustifyCheck
"UncrustifyCheck": {
"IgnoreFiles": [
"Library/OpensslLib/OpensslGen/include/crypto/bn_conf.h",
"Library/OpensslLib/OpensslGen/include/crypto/dso_conf.h",
"Library/OpensslLib/OpensslGen/include/openssl/asn1.h",
"Library/OpensslLib/OpensslGen/include/openssl/asn1t.h",
"Library/OpensslLib/OpensslGen/include/openssl/bio.h",
"Library/OpensslLib/OpensslGen/include/openssl/cmp.h",
"Library/OpensslLib/OpensslGen/include/openssl/cms.h",
"Library/OpensslLib/OpensslGen/include/openssl/conf.h",
"Library/OpensslLib/OpensslGen/include/openssl/configuration-ec.h",
"Library/OpensslLib/OpensslGen/include/openssl/configuration-noec.h",
"Library/OpensslLib/OpensslGen/include/openssl/configuration.h",
"Library/OpensslLib/OpensslGen/include/openssl/crmf.h",
"Library/OpensslLib/OpensslGen/include/openssl/crypto.h",
"Library/OpensslLib/OpensslGen/include/openssl/ct.h",
"Library/OpensslLib/OpensslGen/include/openssl/err.h",
"Library/OpensslLib/OpensslGen/include/openssl/ess.h",
"Library/OpensslLib/OpensslGen/include/openssl/fipskey.h",
"Library/OpensslLib/OpensslGen/include/openssl/lhash.h",
"Library/OpensslLib/OpensslGen/include/openssl/ocsp.h",
"Library/OpensslLib/OpensslGen/include/openssl/opensslv.h",
"Library/OpensslLib/OpensslGen/include/openssl/pkcs12.h",
"Library/OpensslLib/OpensslGen/include/openssl/pkcs7.h",
"Library/OpensslLib/OpensslGen/include/openssl/safestack.h",
"Library/OpensslLib/OpensslGen/include/openssl/srp.h",
"Library/OpensslLib/OpensslGen/include/openssl/ssl.h",
"Library/OpensslLib/OpensslGen/include/openssl/ui.h",
"Library/OpensslLib/OpensslGen/include/openssl/x509.h",
"Library/OpensslLib/OpensslGen/include/openssl/x509v3.h",
"Library/OpensslLib/OpensslGen/include/openssl/x509_vfy.h",
"Library/OpensslLib/OpensslGen/providers/common/der/der_digests_gen.c",
"Library/OpensslLib/OpensslGen/providers/common/der/der_ecx_gen.c",
"Library/OpensslLib/OpensslGen/providers/common/der/der_ec_gen.c",
"Library/OpensslLib/OpensslGen/providers/common/der/der_rsa_gen.c",
"Library/OpensslLib/OpensslGen/providers/common/der/der_wrap_gen.c",
"Library/OpensslLib/OpensslGen/providers/common/include/prov/der_digests.h",
"Library/OpensslLib/OpensslGen/providers/common/include/prov/der_ec.h",
"Library/OpensslLib/OpensslGen/providers/common/include/prov/der_ecx.h",
"Library/OpensslLib/OpensslGen/providers/common/include/prov/der_rsa.h",
"Library/OpensslLib/OpensslGen/providers/common/include/prov/der_wrap.h",
"Library/OpensslLib/OpensslStub/uefiprov.c"
# MU_CHANGE [BEGIN] Move to Shared Crypto
"opensslconf.h"
# MU_CHANGE [END] Move to Shared Crypto
]
}
}
Loading
Loading