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.

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

Restore Device Security [Rebase & FF] #276

Merged
merged 2 commits into from
May 30, 2024

Conversation

makubacki
Copy link
Member

Description

Resolves #275


CHANGE 1:

SecurityPkg: Restore DeviceSecurity (and libspdm submodule)

Reverts the following commit:

"SecurityPkg: Temporarily remove DeviceSecurity (and libspdm) from build"
(11506d5)

The libspdm submodule is updated in the following commit to use a
cmocka from a more reliable host (GitLab). This revert is necessary
for that cherry-pick from edk2 to apply.


CHANGE 2:

[CHERRY-PICK] SecurityPkg: Update libspdm submodule to use GitLab cmocka repo

As noted in DMTF/libspdm#2707, the cmocka
submodule on cryptomilk is unreliable and impacting downstream
consumer builds of SecurityPkg. This is considered a regression in
that pre-existing workflows that clone and recursively initialize
the repo are now broken.

The cmocka host was switched to a more reliable gitlab host in
DMTF/libspdm#2710. This change updates the
submodule in edk2 to use that commit so edk2 users are not blocked
by cryptomilk.org service issues.


  • Impacts functionality?
  • Impacts security?
  • Breaking change?
  • Includes tests?
  • Includes documentation?

How This Was Tested

  • SecurityPkg CI build

Integration Instructions

  • First, note that this PR reverts PR SecurityPkg: Temporarily remove DeviceSecurity (and libspdm) from build #272.
    • Review any changes you may have made in response to that PR.
  • This PR adds the DeviceSecurity code back to the SecurityPkg build. That should not impact downstream users as the code was not removed, only not built in SecurityPkg.
  • The libspdm submodule is added back. That submodule will now be present for downstream repos (and SecurityPkg code) to use.

Reverts the following commit:

"SecurityPkg: Temporarily remove DeviceSecurity (and libspdm) from build"
(11506d5)

The libspdm submodule is updated in the following commit to use a
cmocka from a more reliable host (GitLab). This revert is necessary
for that cherry-pick from edk2 to apply.

Signed-off-by: Michael Kubacki <[email protected]>
…cka repo

As noted in DMTF/libspdm#2707, the cmocka
submodule on cryptomilk is unreliable and impacting downstream
consumer builds of SecurityPkg. This is considered a regression in
that pre-existing workflows that clone and recursively initialize
the repo are now broken.

The cmocka host was switched to a more reliable gitlab host in
DMTF/libspdm#2710. This change updates the
submodule in edk2 to use that commit so edk2 users are not blocked
by cryptomilk.org service issues.

Signed-off-by: Michael Kubacki <[email protected]>
@makubacki makubacki self-assigned this May 30, 2024
@github-actions github-actions bot added the impact:non-functional Does not have a functional impact label May 30, 2024
@codecov-commenter
Copy link

codecov-commenter commented May 30, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 0.71%. Comparing base (4e71706) to head (7eda977).

Additional details and impacted files
@@                Coverage Diff                @@
##           release/202311    #276      +/-   ##
=================================================
- Coverage            1.35%   0.71%   -0.64%     
=================================================
  Files                 162     162              
  Lines               38591   38521      -70     
  Branches              265     265              
=================================================
- Hits                  521     277     -244     
+ Misses              38070   38062       -8     
- Partials                0     182     +182     
Flag Coverage Δ
FmpDevicePkg 4.11% <ø> (-3.97%) ⬇️
SecurityPkg 0.52% <ø> (-0.44%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@makubacki makubacki merged commit 7fe1fbe into microsoft:release/202311 May 30, 2024
19 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
impact:non-functional Does not have a functional impact
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Restore DeviceSecurity Functionality
4 participants