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.

Sign up for GitHub

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

Jump to bottom

fix assert in ssl options clone #72326

Merged
merged 3 commits into from
Jul 17, 2022
Merged

fix assert in ssl options clone #72326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b683a03
fix assert in ssl options clone
wfurt Jul 17, 2022
1ab3f62
add CertificateChainPolicy
wfurt Jul 17, 2022
1e2756b
remove extra assert
wfurt Jul 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/libraries/Common/src/System/Net/Security/CertificateHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ internal static partial class CertificateHelper
{
private const string ClientAuthenticationOID = "1.3.6.1.5.5.7.3.2";

internal static X509Certificate2? GetEligibleClientCertificate(X509CertificateCollection candidateCerts)
internal static X509Certificate2? GetEligibleClientCertificate(X509CertificateCollection? candidateCerts)
{
if (candidateCerts.Count == 0)
if (candidateCerts == null || candidateCerts.Count == 0)
{
return null;
}
Expand All @@ -26,9 +26,9 @@ internal static partial class CertificateHelper
return GetEligibleClientCertificate(certs);
}

internal static X509Certificate2? GetEligibleClientCertificate(X509Certificate2Collection candidateCerts)
internal static X509Certificate2? GetEligibleClientCertificate(X509Certificate2Collection? candidateCerts)
{
if (candidateCerts.Count == 0)
if (candidateCerts == null || candidateCerts.Count == 0)
{
return null;
}
Expand Down
1 change: 1 addition & 0 deletions src/libraries/Common/src/System/Net/Security/SslClientAuthenticationOptionsExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ public static SslClientAuthenticationOptions ShallowClone(this SslClientAuthenti
AllowRenegotiation = options.AllowRenegotiation,
ApplicationProtocols = options.ApplicationProtocols != null ? new List<SslApplicationProtocol>(options.ApplicationProtocols) : null,
CertificateRevocationCheckMode = options.CertificateRevocationCheckMode,
CertificateChainPolicy = options.CertificateChainPolicy,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we missing a test that should have failed without this?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, we should add test to HTTP once QUIC supports CertificateChainPolicy.

CipherSuitesPolicy = options.CipherSuitesPolicy,
ClientCertificates = options.ClientCertificates,
EnabledSslProtocols = options.EnabledSslProtocols,
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Net.Http/src/System/Net/Http/HttpClientHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ public ClientCertificateOption ClientCertificateOptions
#else
ThrowForModifiedManagedSslOptionsIfStarted();
_clientCertificateOptions = value;
_underlyingHandler.SslOptions.LocalCertificateSelectionCallback = (sender, targetHost, localCertificates, remoteCertificate, acceptableIssuers) => CertificateHelper.GetEligibleClientCertificate(ClientCertificates)!;
_underlyingHandler.SslOptions.LocalCertificateSelectionCallback = (sender, targetHost, localCertificates, remoteCertificate, acceptableIssuers) => CertificateHelper.GetEligibleClientCertificate(_underlyingHandler.SslOptions.ClientCertificates)!;
#endif
break;

Expand Down