Add support for alternative CSR headers/footers #2040
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
simonbutcher
added
CLA not applicable
needs-review
hanno-becker
reviewed
Oct 1, 2018
ChangeLog
Outdated
| @@ -13,6 +13,8 @@ Changes | |||
| * Close a test gap in (D)TLS between the client side and the server side: | |||
| test the handling of large packets and small packets on the client side | |||
| in the same way as on the server side. | |||
| * Add support for alternative CSR headers, as used by Microsoft and defined | |||
| in RFC7468. Found by Michael Ernst. Fixes #767. | |||
There was a problem hiding this comment.
We usually use a space after "RFC".
hanno-becker
reviewed
Oct 1, 2018
library/x509_csr.c
Outdated
| buf, NULL, 0, &use_len ); | ||
| cert_header = "-----BEGIN CERTIFICATE REQUEST-----"; | ||
| cert_footer = "-----END CERTIFICATE REQUEST-----"; | ||
| start = strstr( (const char *) buf, cert_header); |
There was a problem hiding this comment.
I think we should leave the detection of headers to mbedtls_pem_read_buffer(). It has a dedicated error code MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT in case they are not present, so we can call mbedtls_pem_read_buffer() with -----{BEGIN/END} CERTIFICATE REQUEST----- first, and fall back to ----{BEGIN/END} NEW CERTIFICATE REQUEST----- if it fails with MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT.
hanno-becker
suggested changes
Oct 1, 2018
simonbutcher
added
needs-work
and removed
needs-review
Add support for RFC7468, and the alternative Microsoft footer/headers for CSR's that contain the text 'BEGIN NEW CERTIFICATE REQUEST' instead of 'BEGIN CERTIFICATE REQUEST'.
Add a test case for alternative headers possible for CSR's, as defined in RFC7468.
Add Changelog entry for fix for alternative header/footers in CSR's.
redtangent
force-pushed
the
csr-alt-header-fix
branch
from
e26e2c8 to
5199227
Compare
|
You're right @hanno-arm. That's a better solution. I've adapted the PR and submitted a new solution based on your suggestion. |
hanno-becker
reviewed
Oct 7, 2018
hanno-becker
suggested changes
Oct 7, 2018
Change the secondary X509 CSR parsing call for the alternative MS header to only occur if the first call fails due to the header being unfound, instead of any call.
|
Review comments addressed. Please re-review @hanno-arm. |
simonbutcher
added
needs-review
AndrzejKurek
approved these changes
Oct 9, 2018
hanno-becker
removed
the
needs-review
simonbutcher
added
needs-ci
simonbutcher
added
the
needs-backports
4 tasks
4 tasks
|
retest |
hanno-becker
removed
the
needs-backports
|
CI is failing on BSD timing test, which is as good as a pass. |
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
Adds support for alternative CSR headers, as defined by RFC7468. Microsoft uses alternative footers/headers for CSR's that contain the text 'BEGIN NEW CERTIFICATE REQUEST' instead of 'BEGIN CERTIFICATE REQUEST'. This PR adds support for those CSRs.
This is an enhancement in the sense that it supports more tools, but it's also a fix for an interoperability problem. The fix comes at no cost to the API, so I think it should be backported. I'll do that once this PR is approved.
This PR fixes #767.
Status
READY
Requires Backporting
Yes
Which branch?
mbedtls-2.7andmbedtls-2.1Todos