Improve SSlibKey validation in _verify #795
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
lukpueh
commented
Apr 24, 2024
| @@ -341,9 +341,18 @@ def _verify_ed25519_fallback(self, signature: bytes, data: bytes) -> None: | |||
|
|
|||
| def _verify(self, signature: bytes, data: bytes) -> None: | |||
There was a problem hiding this comment.
The function has become a bit unwieldy. But I did resist the temptation to refactor anything, mostly because want this PR to be easy to review ... and also because I was unsure how to make it better. :)
One idea I had was to factor out the long deserialization if/else switch to something like a _to_crypto method: 504ffae
...
I'll think about this some more.
lukpueh
force-pushed
the
sslibkey-validation
branch
from
5ec0e4c to
b409d6b
Compare
jku
approved these changes
Apr 25, 2024
Added checks as requrested in secure-systems-lab#766: - keytype matches scheme - scheme matches deserialized key type (only for pem formatted keyvals; for ed25519 the check happens implicitly on deserialization) - scheme matches deserialized key curve (only for ecdsa) Note that this PR does not move the checks to the constructor as suggested in secure-systems-lab#766. This may or may not be addressed in a follow-up PR. failing tests fixed in secure-systems-lab#794 Signed-off-by: Lukas Puehringer <[email protected]>
lukpueh
force-pushed
the
sslibkey-validation
branch
from
b409d6b to
3f70df5
Compare
|
rebase on main. tests should pass now. |
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.
Added checks as requested in #766:
Note that this PR does not move the checks to the constructor as suggested in #766. This may or may not be addressed in a follow-up PR.
failing tests fixed in #794