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

Repo File Sync: synced file(s) with microsoft/mu_devops #64

Merged
merged 3 commits into from
Apr 5, 2024
Merged

Repo File Sync: synced file(s) with microsoft/mu_devops #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c40ea7
Mu Basecore 202311 Integration
makubacki Mar 21, 2024
133b733
CryptoPkg/BaseCryptLib: Add additional RSAES-OAEP crypto functions (#78)
makubacki Mar 22, 2024
4ce116b
Repo File Sync: synced file(s) with microsoft/mu_devops
uefibot Apr 5, 2024
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
26 changes: 13 additions & 13 deletions .azuredevops/pipelines/template-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,23 +41,23 @@ parameters:
jobs:
- ${{ each item in parameters.build_matrix }}:
- job: Build_${{ item.Key }}

timeoutInMinutes: 120

workspace:
clean: all

pool:
vmImage: ${{ item.Value.VmImage }}

${{ if eq(item.Value.Container, true) }}:
container:
image: ${{ parameters.linux_container_image }}

steps:
- checkout: self
clean: true

- ${{ if eq(item.Value.Container, true) }}:
- script: pip install -r pip-requirements.txt --upgrade
displayName: Install and Upgrade pip Modules
Expand All @@ -70,14 +70,14 @@ jobs:
scriptSource: 'filePath'
scriptPath: MultiFlavorBuild.py
arguments: --setup TOOL_CHAIN_TAG=${{ item.Value.ToolChain }}

- task: PythonScript@0
displayName: Update Workspace Extdeps
inputs:
scriptSource: 'filePath'
scriptPath: MultiFlavorBuild.py
arguments: --update TOOL_CHAIN_TAG=${{ item.Value.ToolChain }}

- task: PythonScript@0
displayName: 'Build Crypto Drivers'
inputs:
Expand Down Expand Up @@ -111,8 +111,8 @@ jobs:
displayName: Save Configs and License
inputs:
contents: |
MU_BASECORE\CryptoPkg\Driver\Packaging\edk2-BaseCryptoDriver.config.json
MU_BASECORE\CryptoPkg\Driver\Packaging\License.txt
CryptoBinPkg\Driver\Packaging\edk2-BaseCryptoDriver.config.json
CryptoBinPkg\Driver\Packaging\License.txt
targetFolder: '$(Build.ArtifactStagingDirectory)/Extra'
flattenFolders: true
- task: PublishPipelineArtifact@1
Expand Down Expand Up @@ -181,7 +181,7 @@ jobs:
**/*.txt
targetFolder: '$(Pipeline.Workspace)/Staging'
flattenFolders: true

# Files in staging exists in this format
# {FLAVOR}
# -- CryptoPkg
Expand Down Expand Up @@ -230,7 +230,7 @@ jobs:
inputs:
targetPath: '$(Pipeline.Workspace)/FinalPackage'
artifactName: CryptoBin_Nuget_Package

- ${{ if eq(parameters.publish_nuget, true) }}:
- job: publish_package
displayName: Publish CryptoBin_${{parameters.publish_version}}
Expand Down Expand Up @@ -288,7 +288,7 @@ jobs:
--CustomLicensePath "$licenseFile";

Get-Content $(Build.StagingDirectory)/NugetPackagingLog.txt;

- task: NuGetAuthenticate@0
displayName: Authenticate Local Feed

Expand Down
2 changes: 1 addition & 1 deletion .github/release-draft-config-n-1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
name-template: 'v$RESOLVED_VERSION'
tag-template: 'v$RESOLVED_VERSION'

commitish: refs/heads/release/202208
commitish: refs/heads/release/202302
filter-by-commitish: true

template: |
Expand Down
2 changes: 1 addition & 1 deletion .github/release-draft-config-n.yml
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A release/202311 branch does not currently exist in this repo. Need to hold this PR.

Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
name-template: 'v$RESOLVED_VERSION'
tag-template: 'v$RESOLVED_VERSION'

commitish: refs/heads/release/202302
commitish: refs/heads/release/202311
filter-by-commitish: true

template: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/auto-approve.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ jobs:

if: |
github.event.pull_request.user.login == 'dependabot[bot]' || github.event.pull_request.user.login == 'uefibot'
uses: microsoft/mu_devops/.github/workflows/[email protected].1
uses: microsoft/mu_devops/.github/workflows/[email protected].8
secrets: inherit
2 changes: 1 addition & 1 deletion .github/workflows/auto-merge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@ jobs:

if: |
github.event.pull_request.user.login == 'dependabot[bot]' || github.event.pull_request.user.login == 'uefibot'
uses: microsoft/mu_devops/.github/workflows/[email protected].1
uses: microsoft/mu_devops/.github/workflows/[email protected].8
secrets: inherit
2 changes: 1 addition & 1 deletion .github/workflows/issue-assignment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ jobs:
contents: read
issues: write

uses: microsoft/mu_devops/.github/workflows/[email protected].1
uses: microsoft/mu_devops/.github/workflows/[email protected].8
2 changes: 1 addition & 1 deletion .github/workflows/label-issues.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ jobs:
contents: read
pull-requests: write

uses: microsoft/mu_devops/.github/workflows/[email protected].1
uses: microsoft/mu_devops/.github/workflows/[email protected].8
2 changes: 1 addition & 1 deletion .github/workflows/label-sync.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ jobs:
permissions:
issues: write

uses: microsoft/mu_devops/.github/workflows/[email protected].1
uses: microsoft/mu_devops/.github/workflows/[email protected].8
4 changes: 2 additions & 2 deletions .github/workflows/release-draft.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ name: Update Release Draft
on:
push:
branches:
- release/202302
- release/202311

jobs:
draft:
Expand All @@ -32,5 +32,5 @@ jobs:
contents: write
pull-requests: write

uses: microsoft/mu_devops/.github/workflows/[email protected].1
uses: microsoft/mu_devops/.github/workflows/[email protected].8
secrets: inherit
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ jobs:
issues: write
pull-requests: write

uses: microsoft/mu_devops/.github/workflows/[email protected].1
uses: microsoft/mu_devops/.github/workflows/[email protected].8
2 changes: 1 addition & 1 deletion .github/workflows/triage-issues.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ jobs:
permissions:
issues: write

uses: microsoft/mu_devops/.github/workflows/[email protected].1
uses: microsoft/mu_devops/.github/workflows/[email protected].8
16 changes: 10 additions & 6 deletions CryptoBinPkg/CryptoBinPkg.dsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
RngLib|MdePkg/Library/BaseRngLib/BaseRngLib.inf
SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf
SmmCpuRendezvousLib|MdePkg/Library/SmmCpuRendezvousLibNull/SmmCpuRendezvousLibNull.inf
StackCheckFailureHookLib|MdePkg/Library/StackCheckFailureHookLibNull/StackCheckFailureHookLibNull.inf
SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf
TlsLib|CryptoPkg/Library/TlsLibNull/TlsLibNull.inf
Expand All @@ -77,10 +78,17 @@
#
# For stack protection
#
[LibraryClasses.common.PEI_CORE]
NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf

[LibraryClasses.common.PEIM, LibraryClasses.common.MM_CORE_STANDALONE, LibraryClasses.common.MM_STANDALONE]
NULL|MdePkg/Library/StackCheckLib/StackCheckLibStaticInit.inf

[LibraryClasses.common.DXE_CORE, LibraryClasses.common.SMM_CORE, LibraryClasses.common.DXE_SMM_DRIVER, LibraryClasses.common.DXE_DRIVER, LibraryClasses.common.DXE_RUNTIME_DRIVER, LibraryClasses.common.DXE_SAL_DRIVER, LibraryClasses.common.UEFI_DRIVER, LibraryClasses.common.UEFI_APPLICATION]
NULL|MdePkg/Library/StackCheckLib/StackCheckLibDynamicInit.inf

[LibraryClasses.X64.SMM_CORE, LibraryClasses.X64.DXE_SMM_DRIVER, LibraryClasses.X64.MM_CORE_STANDALONE, LibraryClasses.X64.MM_STANDALONE, LibraryClasses.X64.DXE_CORE, LibraryClasses.X64.DXE_DRIVER, LibraryClasses.X64.DXE_RUNTIME_DRIVER, LibraryClasses.X64.DXE_SAL_DRIVER, LibraryClasses.X64.UEFI_DRIVER, LibraryClasses.X64.UEFI_APPLICATION]
NULL|MdePkg/Library/StackCheckLib/StackCheckLib.inf
RngLib|MdePkg/Library/BaseRngLib/BaseRngLib.inf
StackCheckFailureLib|MdePkg/Library/StackCheckFailureLibNull/StackCheckFailureLibNull.inf

[LibraryClasses.common.DXE_DRIVER, LibraryClasses.common.UEFI_APPLICATION]
RngLib|MdePkg/Library/DxeRngLib/DxeRngLib.inf
Expand All @@ -98,10 +106,6 @@
IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/ArmCompilerIntrinsicsLib.inf
NULL|MdePkg/Library/CompilerIntrinsicsLib/ArmCompilerIntrinsicsLib.inf

# Add support for stack protector
NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
StackCheckFailureLib|MdePkg/Library/StackCheckFailureLibNull/StackCheckFailureLibNull.inf

[LibraryClasses.common.PEIM]
HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf
MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
Expand Down
5 changes: 4 additions & 1 deletion CryptoBinPkg/Driver/Bin/Crypto.inc.dsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
# AUTOGENED AS Crypto.inc.dsc
# DO NOT MODIFY
# GENERATED ON: 2024-02-12 18:57:08.367369
# GENERATED ON: 2024-03-08 19:11:45.618507

[Defines]
!ifndef CRYPTO_SERVICES
Expand Down Expand Up @@ -129,6 +129,9 @@
gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceX509GetTBSCert | TRUE
gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServicePkcs5HashPassword | TRUE
gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServicePkcs1v2Encrypt | TRUE
gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceRsaOaepEncrypt | TRUE
gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServicePkcs1v2Decrypt | TRUE
gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceRsaOaepDecrypt | TRUE
gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServicePkcs7GetSigners | TRUE
gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServicePkcs7FreeSigners | TRUE
gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServicePkcs7GetCertificatesList | TRUE
Expand Down
6 changes: 5 additions & 1 deletion CryptoBinPkg/Driver/Bin/Crypto.pcd.STANDARD.inc.dsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
# AUTOGENED AS Crypto.pcd.STANDARD.inc.dsc
# DO NOT MODIFY
# GENERATED ON: 2024-02-29 11:04:07.986469
# GENERATED ON: 2024-03-08 19:11:45.618507

# HMACSHA256 family
gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceHmacSha256New | TRUE
Expand All @@ -15,6 +15,7 @@
# PKCS family
gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServicePkcs5HashPassword | TRUE
gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServicePkcs1v2Encrypt | TRUE
gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServicePkcs1v2Decrypt | TRUE
gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServicePkcs7GetSigners | TRUE
gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServicePkcs7FreeSigners | TRUE
gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServicePkcs7Verify | TRUE
Expand Down Expand Up @@ -99,6 +100,7 @@
# Individuals
gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceRsaNew | TRUE
gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceRsaFree | TRUE
gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceRsaSetKey | TRUE
gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceRsaPkcs1Verify | TRUE
gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceRsaPssSign | TRUE
gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceRsaPssVerify | TRUE
Expand All @@ -107,5 +109,7 @@
gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceX509GetCommonName | TRUE
gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceX509GetOrganizationName | TRUE
gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceX509GetTBSCert | TRUE
gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceRsaOaepEncrypt | TRUE
gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceRsaOaepDecrypt | TRUE
# AUTOGEN ENDS
# ****************************************************************************
Loading
Loading