Support pkcs12 certificates in schannel #2580
Draft
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
nibanks
reviewed
Mar 30, 2022
Comment on lines
+713
to
+714
| HCERTSTORE CertStore, | ||
| PCCERT_CONTEXT* CertContext |
src/platform/cert_capi.c
Outdated
Comment on lines
755
to
766
| if (!CryptQueryObject( | ||
| ObjectType, | ||
| CredConfig->CertificatePkcs12->Asn1Blob, | ||
| CERT_QUERY_CONTENT_FLAG_PFX, | ||
| CERT_QUERY_FORMAT_FLAG_ALL, | ||
| 0, | ||
| &MsgAndCertEncodingType, | ||
| &ContentType, | ||
| &FormatType, | ||
| &CertStore, | ||
| &Msg, | ||
| &CertContext)) { |
There was a problem hiding this comment.
Suggested change
| if (!CryptQueryObject( | |
| ObjectType, | |
| CredConfig->CertificatePkcs12->Asn1Blob, | |
| CERT_QUERY_CONTENT_FLAG_PFX, | |
| CERT_QUERY_FORMAT_FLAG_ALL, | |
| 0, | |
| &MsgAndCertEncodingType, | |
| &ContentType, | |
| &FormatType, | |
| &CertStore, | |
| &Msg, | |
| &CertContext)) { | |
| if (!CryptQueryObject( | |
| ObjectType, | |
| CredConfig->CertificatePkcs12->Asn1Blob, | |
| CERT_QUERY_CONTENT_FLAG_PFX, | |
| CERT_QUERY_FORMAT_FLAG_ALL, | |
| 0, | |
| &MsgAndCertEncodingType, | |
| &ContentType, | |
| &FormatType, | |
| &CertStore, | |
| &Msg, | |
| &CertContext)) { |
| goto Exit; | ||
| } | ||
|
|
||
| // Find the first cert with a private key. If none then take the first cert |
There was a problem hiding this comment.
Suggested change
| // Find the first cert with a private key. If none then take the first cert | |
| // | |
| // Find the first cert with a private key. If none then take the first cert | |
| // |
| } | ||
|
|
||
| if (CertContext == NULL) { | ||
| // TODO Maybe better error |
There was a problem hiding this comment.
Probably, and plus, add an error log.
src/platform/tls_schannel.c
Outdated
Comment on lines
978
to
979
| case QUIC_CREDENTIAL_TYPE_CERTIFICATE_FILE_PROTECTED: | ||
| case QUIC_CREDENTIAL_TYPE_CERTIFICATE_PKCS12: |
There was a problem hiding this comment.
I'm a bit confused why these should be NOT_SUPPORTED. Is this supposed to kernel specific?
There was a problem hiding this comment.
Yes this chain is kernel specific. Which will never support these 2 methods, at least in the current state.
There was a problem hiding this comment.
Wait actually nevermind. I messed up here.
|
This change is dependent on #2606 which requires implementing a PCKS12 writer in the selfsigned certificate generating code. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
Part of #1453. Adds support for loading PKCS12 certificates in schannel
Testing
Pkcs12 tests are enabled on schannel
Documentation
No