Skip to content

Merging internal commits for release/6.0#88680

Merged
carlossanlop merged 12 commits intodotnet:release/6.0from
vseanreesermsft:internal-merge-6.0-2023-07-11-1018
Jul 12, 2023
Merged

Merging internal commits for release/6.0#88680
carlossanlop merged 12 commits intodotnet:release/6.0from
vseanreesermsft:internal-merge-6.0-2023-07-11-1018

Conversation

@vseanreesermsft
Copy link

No description provided.

dotnet-bot and others added 12 commits May 23, 2023 00:42
…assword encrypted PFX certificates

When decrypting the payload with empty string and null passwords, try reading the payload with the Asn reader to ensure the header matches the expected format. If that succeeds, then proceed with the iteration counting. This guards against a false-positive match that previously caused our iteration count work to throw/abort, thus preventing some null-password encrypted payloads from being loaded.
@ghost ghost added the area-codeflow for labeling automated codeflow label Jul 11, 2023
@ghost ghost assigned vseanreesermsft Jul 11, 2023
@carlossanlop carlossanlop added the Servicing-approved Approved for servicing release label Jul 11, 2023
@carlossanlop carlossanlop merged commit 372357d into dotnet:release/6.0 Jul 12, 2023
@ghost ghost locked as resolved and limited conversation to collaborators Aug 13, 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.

5 participants