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

Fix failing CertificateValidationRemoteServer.ConnectWithRevocation_WithCallback test #99915

Merged
merged 3 commits into from
Mar 19, 2024

Conversation

rzikm
Copy link
Member

@rzikm rzikm commented Mar 18, 2024

Fixes issue reported in #99425.

Missing testName parameter to BuildPrivatePki led to end entity cert Subjects like CN=server.example, O="" which caused chain building on Windows to fail with exception.

Copy link
Contributor

Tagging subscribers to this area: @dotnet/ncl, @bartonjs, @vcsjones
See info in area-owners.md if you want to be subscribed.

@rzikm
Copy link
Member Author

rzikm commented Mar 18, 2024

/azp run runtime-libraries-coreclr outerloop

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@rzikm
Copy link
Member Author

rzikm commented Mar 19, 2024

All affected tests (System.Net.Security and System.Security.Cyrptography) passed

@rzikm rzikm merged commit c352ef6 into dotnet:main Mar 19, 2024
83 of 95 checks passed
@rzikm
Copy link
Member Author

rzikm commented Mar 19, 2024

/backport to release/8.0-staging

Copy link
Contributor

Started backporting to release/8.0-staging: https://github.com/dotnet/runtime/actions/runs/8340919208

Copy link
Contributor

@rzikm backporting to release/8.0-staging failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Applying: Don't add empty Organization to Subject string
Applying: Make sure testName is populated when creating test PKI
Using index info to reconstruct a base tree...
M	src/libraries/System.Net.Security/tests/FunctionalTests/CertificateValidationRemoteServer.cs
M	src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamCertificateContextTests.cs
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamCertificateContextTests.cs
Auto-merging src/libraries/System.Net.Security/tests/FunctionalTests/CertificateValidationRemoteServer.cs
CONFLICT (content): Merge conflict in src/libraries/System.Net.Security/tests/FunctionalTests/CertificateValidationRemoteServer.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 Make sure testName is populated when creating test PKI
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 128

Please backport manually!

Copy link
Contributor

@rzikm an error occurred while backporting to release/8.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 Mar 19, 2024
…ithCallback test (dotnet#99915)

* Don't add empty Organization to Subject string

* Make sure testName is populated when creating test PKI

* Minor changes
@github-actions github-actions bot locked and limited conversation to collaborators Apr 19, 2024
@karelz karelz added this to the 9.0.0 milestone May 14, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants