Avoid rooting X509Certificate2 in SslSessionCache #101120
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Tagging subscribers to this area: @dotnet/ncl, @bartonjs, @vcsjones |
campersau
reviewed
Apr 16, 2024
src/libraries/System.Net.Security/src/System/Net/Security/SslStreamPal.Windows.cs
Outdated
Show resolved
Hide resolved
…treamPal.Windows.cs Co-authored-by: campersau <buchholz.bastian@googlemail.com>
|
CI Failures seem unrelated. |
This was referenced Apr 16, 2024
…ws-prevents-X509Certificate2-cleanup
|
Test failuers are unrelated |
|
/backport to release/8.0-staging |
|
/backport to release/6.0-staging |
|
Started backporting to release/8.0-staging: https://github.com/dotnet/runtime/actions/runs/8712510692 |
|
Started backporting to release/6.0-staging: https://github.com/dotnet/runtime/actions/runs/8712513281 |
|
@rzikm backporting to release/6.0-staging failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Avoid rooting X509Certificate2 in SslSessionCache
Using index info to reconstruct a base tree...
M src/libraries/Common/src/Interop/Windows/SspiCli/SecuritySafeHandles.cs
M src/libraries/System.Net.Security/src/System/Net/CertificateValidationPal.Windows.cs
M src/libraries/System.Net.Security/src/System/Net/Security/SslStreamPal.Windows.cs
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/System.Net.Security/src/System/Net/Security/SslStreamPal.Windows.cs
CONFLICT (content): Merge conflict in src/libraries/System.Net.Security/src/System/Net/Security/SslStreamPal.Windows.cs
Auto-merging src/libraries/System.Net.Security/src/System/Net/CertificateValidationPal.Windows.cs
Auto-merging src/libraries/Common/src/Interop/Windows/SspiCli/SecuritySafeHandles.cs
CONFLICT (content): Merge conflict in src/libraries/Common/src/Interop/Windows/SspiCli/SecuritySafeHandles.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Avoid rooting X509Certificate2 in SslSessionCache
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@rzikm an error occurred while backporting to release/6.0-staging, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
rzikm
added a commit
to rzikm/dotnet-runtime
that referenced
this pull request
Apr 17, 2024
…et#101120) * Avoid rooting X509Certificate2 in SslSessionCache * Update src/libraries/System.Net.Security/src/System/Net/Security/SslStreamPal.Windows.cs Co-authored-by: campersau <buchholz.bastian@googlemail.com> --------- Co-authored-by: campersau <buchholz.bastian@googlemail.com>
rzikm
added a commit
that referenced
this pull request
Apr 23, 2024
) (#101167) * Avoid rooting X509Certificate2 in SslSessionCache * Update src/libraries/System.Net.Security/src/System/Net/Security/SslStreamPal.Windows.cs --------- Co-authored-by: campersau <buchholz.bastian@googlemail.com>
matouskozak
pushed a commit
to matouskozak/runtime
that referenced
this pull request
Apr 30, 2024
* Avoid rooting X509Certificate2 in SslSessionCache * Update src/libraries/System.Net.Security/src/System/Net/Security/SslStreamPal.Windows.cs Co-authored-by: campersau <buchholz.bastian@googlemail.com> --------- Co-authored-by: campersau <buchholz.bastian@googlemail.com>
Ruihan-Yin
pushed a commit
to Ruihan-Yin/runtime
that referenced
this pull request
May 30, 2024
* Avoid rooting X509Certificate2 in SslSessionCache * Update src/libraries/System.Net.Security/src/System/Net/Security/SslStreamPal.Windows.cs Co-authored-by: campersau <buchholz.bastian@googlemail.com> --------- Co-authored-by: campersau <buchholz.bastian@googlemail.com>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #101090.