der: remove decode-time SET OF ordering checks#625
Merged
Conversation
5 tasks
Member
Author
|
@carl-wallace it's now failing due to this test which checks for the old behavior: https://github.com/RustCrypto/formats/blame/master/x509/tests/name.rs#L129-L133 I think it can be safely removed if we do wish to tolerate out-of-order sets. |
Contributor
|
Removed (or inverted). Thanks for making that change. |
9b338c4 to
4a9dbce
Compare
Member
Author
|
Ok, I inverted the check it was performing. Perhaps I should vendor it into the |
Some DER serializer implementations fail to properly sort elements of a `SET OF`. This is technically non-canonical, but occurs frequently enough that most DER decoders tolerate it. Unfortunately because of that, we must also follow suit. This commit builds an `ArrayVec` or `Vec` of the incoming decoded set elements, and then unconditionally sorts it retroactively, ensuring all `SET OF` types internally reflect the proper order, but out-of-order `SET OF` messages are tolerated when coming off-the-wire. The sort implementation is merge sort, which should be efficient for already-in-order or mostly-in-order sets.
4a9dbce to
1275597
Compare
Merged
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
Some DER serializer implementations fail to properly sort elements of a
SET OF. This is technically non-canonical, but occurs frequently enough that most DER decoders tolerate it. Unfortunately because of that, we must also follow suit.This commit builds an
ArrayVecorVecof the incoming decoded set elements, and then unconditionally sorts it retroactively, ensuring allSET OFtypes internally reflect the proper order, but out-of-orderSET OFmessages are tolerated when coming off-the-wire.The sort implementation is merge sort, which should be efficient for already-in-order or mostly-in-order sets.