avoid allocating collection for intermediate certificates #68188
Conversation
This file contains hidden or 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, @vcsjones Issue DetailsThere are actually two collection we will save in this change for each TLS handshake: Current code always allocates The second collocation comes surprisingly from if (_chainPolicy != null && _chainPolicy.CustomTrustStore != null)does not really work well with public X509Certificate2Collection CustomTrustStore => _customTrustStore ??= new X509Certificate2Collection();
|
rzikm
approved these changes
Apr 19, 2022
src/libraries/Common/src/Interop/Windows/SChannel/UnmanagedCertificateContext.IntPtr.cs
Outdated
Show resolved
Hide resolved
src/libraries/System.Net.Security/src/System/Net/CertificateValidationPal.cs
Show resolved
Hide resolved
src/libraries/System.Net.Security/src/System/Net/CertificateValidationPal.cs
Show resolved
Hide resolved
src/libraries/System.Net.Security/src/System/Net/CertificateValidationPal.Android.cs
Outdated
Show resolved
Hide resolved
src/libraries/System.Net.Security/src/System/Net/CertificateValidationPal.OSX.cs
Outdated
Show resolved
Hide resolved
src/libraries/System.Net.Security/src/System/Net/CertificateValidationPal.Unix.cs
Outdated
Show resolved
Hide resolved
src/libraries/System.Net.Security/src/System/Net/CertificateValidationPal.Windows.cs
Outdated
Show resolved
Hide resolved
src/libraries/System.Net.Security/src/System/Net/Security/SecureChannel.cs
Show resolved
Hide resolved
campersau
reviewed
Apr 19, 2022
| X509Certificate2Collection remoteCertificateStore = | ||
| UnmanagedCertificateContext.GetRemoteCertificatesFromStoreContext(certHandle); | ||
| X509Certificate2Collection remoteCertificateStore = new X509Certificate2Collection(); | ||
| UnmanagedCertificateContext.GetRemoteCertificatesFromStoreContext(certHandle, remoteCertificateStore); |
Contributor
There was a problem hiding this comment.
Suggested change
| UnmanagedCertificateContext.GetRemoteCertificatesFromStoreContext(certHandle, remoteCertificateStore); | |
| UnmanagedCertificateContext.GetRemoteCertificatesFromStoreContext(certHandle, remoteCertificateStore); |
directhex
pushed a commit
to directhex/runtime
that referenced
this pull request
Apr 21, 2022
* avoid allocating collection for intermediate certificates * fix NRE for custom trust * feedback from review
ghost
locked as resolved and limited conversation to collaborators
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
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.
There are actually two collection we will save in this change for each TLS handshake:
Current code always allocates
X509Certificate2Collectionto store intermediate certificates from handshake just to add all of them to X509Chain before validation. This change fixes the internal API so that we allocate X509Chain as needed and we add any intermediate certificates to it directly without need to allocate extra collection. (using ref X509Chain?)The second collocation comes surprisingly from
nullcheck:does not really work well with
CustomTrustStorewill never benulland the check will allocate in typical case.