Skip to content

[manual] Merge release/7.0-staging into release/7.0 - #95166

Merged
carlossanlop merged 1 commit into
dotnet:release/7.0from
carlossanlop:release/7.0-staging
Nov 23, 2023
Merged

[manual] Merge release/7.0-staging into release/7.0#95166
carlossanlop merged 1 commit into
dotnet:release/7.0from
carlossanlop:release/7.0-staging

Conversation

@carlossanlop

Copy link
Copy Markdown
Contributor

Merge commit!

… Linux (#95089)

* Re-enable MD5 for FIPS with OpenSSL 3

* Permit MD5 on OpenSSL 1.1.1 regardless of FIPS

* Fix build

---------

Co-authored-by: Kevin Jones <kevin@vcsjones.com>
@carlossanlop carlossanlop added Servicing-approved Approved for servicing release area-codeflow for labeling automated codeflow labels Nov 23, 2023
@carlossanlop carlossanlop self-assigned this Nov 23, 2023
@carlossanlop
carlossanlop merged commit 8473eeb into dotnet:release/7.0 Nov 23, 2023
@carlossanlop
carlossanlop deleted the release/7.0-staging branch November 23, 2023 03:03
@github-actions github-actions Bot locked and limited conversation to collaborators Dec 23, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-codeflow for labeling automated codeflow Servicing-approved Approved for servicing release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants