trust: Use the same parser code for parsing and checking #483
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
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| /* Count newlines in the PEM block */ | ||
| pos = lexer->at; | ||
| for (; pos < end; pos++) { | ||
| pos = memchr (pos, '\n', end - pos); |
Check notice
Code scanning / CodeQL
For loop variable changed in body
ueno
force-pushed
the
wip/dueno/trust-check-format
branch
from
4beacb9 to
4d9f9b5
Compare
|
With this (bogus) input: Old: $ _build/trust/trust check-format bogus.p11-kit
Failed at line 11: label in the END block does not match the label in the BEGIN block
bogus.p11-kit: FAILNew: $ _build/trust/trust check-format bogus.p11-kit
p11-kit: bogus.p11-kit:2: class: invalid value
p11-kit: bogus.p11-kit:3: label: invalid value
p11-kit: bogus.p11-kit:4: object-id: invalid value
p11-kit: bogus.p11-kit:5: value: invalid value
p11-kit: bogus.p11-kit:11: BEGIN ...: invalid pem block
bogus.p11-kit: FAIL |
ueno
force-pushed
the
wip/dueno/trust-check-format
branch
2 times, most recently
from
81455d8 to
002a527
Compare
ZoltanFridrich
approved these changes
Apr 6, 2023
The trust check-format command used a dedicated parsing code for the .p11-kit format, which behaves differently from the original parsing code: sometimes it is stricter (e.g., PEM block), while other times it is not (e.g., constant names and OIDs). This makes it use the same single parser to align with the original behavior. Signed-off-by: Daiki Ueno <[email protected]>
This adds the new field "line" to p11_lexer so any errors are printed with the line numbers where they happen. Also make the header to use appropriate types for sizes and token types. Signed-off-by: Daiki Ueno <[email protected]>
ueno
force-pushed
the
wip/dueno/trust-check-format
branch
from
002a527 to
6275559
Compare
Signed-off-by: Daiki Ueno <[email protected]>
ueno
force-pushed
the
wip/dueno/trust-check-format
branch
from
6275559 to
01c944e
Compare
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.
The trust check-format command used a dedicated parsing code for the .p11-kit format, which behaves differently from the original parsing code: sometimes it is stricter (e.g., PEM block), while other times it is not (e.g., constant names and OIDs). This makes it use the same single parser to align with the original behavior.