Fix MGF issues #4
Closed
Conversation
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
timlegge
force-pushed
the
mgf1_issues
branch
3 times, most recently
from
60768bd to
544cb81
Compare
timlegge
added a commit
that referenced
this pull request
Mar 19, 2023
[ Major change since 0.08 ]
@NGEfreak asked if Crypt::Random could be replaced with Crypt::PRNG
to eliminate the need for pari which requires network connectivity.
Makes sense because CryptX is already a dependency.
Known issue:
rsa-oaep with different digests for the MGF and the label is broken and
was broken from the initial implementation.
This is being resolved via #4
- f04a0d5 Increment version for official release
- 33cccb7 v0.10
timlegge
force-pushed
the
mgf1_issues
branch
4 times, most recently
from
ad69a86 to
544b250
Compare
waterkip
requested changes
Mar 30, 2023
| my $self = shift; | ||
| my $method = shift; | ||
|
|
||
| return if ! defined $method; |
| my $self = shift; | ||
| my $method = shift; | ||
|
|
||
| return if ! defined $method; |
| my $self = shift; | ||
| my $method = shift; | ||
|
|
||
| return if ! defined $method; |
Contributor
There was a problem hiding this comment.
You do an exists later on, shouldn't it either croak/die/warn about method not being specified or use the default which is used later on?
So, method having value '' or 0 is fine, but undef isn't. I would perhaps do $method //= ''; and continue with the function. Or just croak if it is undef.
| my $self = shift; | ||
| my $method = shift; | ||
|
|
||
| return if ! defined $method; |
| $method{OAEPparams} = $keyinfo->[0]->findvalue('//xenc:EncryptedKey/xenc:EncryptionMethod/xenc:OAEPparams', $context); | ||
| $method{MGF} = $keyinfo->[0]->findvalue('//xenc:EncryptedKey/xenc:EncryptionMethod/xenc:MGF/@Algorithm', $context); | ||
|
|
||
| if ($method{Algorithm} eq 'http://www.w3.org/2009/xmlenc11#rsa-oaep') { |
Contributor
There was a problem hiding this comment.
L511-519 and 529-540 are the same. Perhaps make a function for it?
| } | ||
| elsif ($keymethod->{Algorithm} eq 'http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p') { | ||
| return $self->{key_obj}->decrypt($encryptedkey, 'oaep', 'SHA1', decode_base64($keymethod->{OAEPparams})); | ||
| my $oaep_params = defined $keymethod->{OAEPparams} ? |
Contributor
There was a problem hiding this comment.
This is also almost the same as the additions starting at 652.
| } | ||
| elsif ($keymethod eq 'http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p') { | ||
| ${$key} = $rsa_pub->encrypt(${$key}, 'oaep', 'SHA1', $self->{oaep_params}); | ||
| my $oaep_label_hash = (defined $self->{oaep_label_hash} && $self->{oaep_label_hash} ne '') ? |
Contributor
There was a problem hiding this comment.
683 and below matches 692 and below as well.
Contributor
Author
|
Closing in favour of #12 which is a rebase and seems to fix most of these issues |
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.
libtom (CryptX <= 0.077) does not support specifying the a MGF and OEAPparam digest that differ.
This sorts out most of the issues. Thinking now I suspect that it will still allow you to generate XML that will not properly decrypt but basically, the two must use the same hash in both