Resolve XML-encoded carriage returns during signature validation #576
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
|
I reviewed the diff, LGTM. |
markstos
approved these changes
Mar 25, 2021
|
Thanks for including some tests. |
|
@cjbarth This seems like a fix worth releasing on the 2.x branch. |
|
I will gladly release 2.x if another PR against that branch is landed. As for this, I'd like to let #574 land before landing this so that we don't cause merge conflicts for that huge PR. We'll still get this landed before 3.x. @mhassan1, would you like to create this PR against the 2.x branch so we can do a release to the 2.x series while we are waiting for 3.x to get finished up? |
mhassan1
changed the title
|
@mhassan1 Could you please update this PR to resolve the merge conflicts and we'll get this landed for the 3.x release? |
cjbarth
requested changes
Apr 5, 2021
Merged
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
See #575 for background. This PR duplicates #578 for
master.This adds XML normalization to
validateSignatureForCertbefore sending it toxml-crypto. It usesDOMParserfor normalization tasks such as replacement of XML-encoded entities ( ) with their actual representations (carriage return).Checklist: