Implement message decryption using SEIPDv2 and PKESKv6 packets #1768
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
vanitasvitae
commented
Aug 6, 2024
| @@ -68,7 +68,7 @@ static X9ECParameters getX9Parameters(ASN1ObjectIdentifier curveOID) | |||
| static HybridValueParameterSpec getHybridValueParameterSpecWithPrepend(byte[] ephmeralPublicKey, PublicKeyPacket pkp, String algorithmName) | |||
| throws IOException | |||
| { | |||
| return new HybridValueParameterSpec(Arrays.concatenate(ephmeralPublicKey, pkp.getEncoded()), true, new UserKeyingMaterialSpec(Strings.toByteArray("OpenPGP " + algorithmName))); | |||
| return new HybridValueParameterSpec(Arrays.concatenate(ephmeralPublicKey, pkp.getKey().getEncoded()), true, new UserKeyingMaterialSpec(Strings.toByteArray("OpenPGP " + algorithmName))); | |||
There was a problem hiding this comment.
Finding this bugger was a pain! :D
|
I will try to minimize the diff and then mark this PR as ready. |
vanitasvitae
force-pushed
the
decryptionv6
branch
4 times, most recently
from
c2d9314
to
463548d
Compare
vanitasvitae
force-pushed
the
decryptionv6
branch
from
db923cf
to
88d4816
Compare
TODO: Revert once bcgit#1752 is merged
vanitasvitae
force-pushed
the
decryptionv6
branch
from
88d4816
to
f68f0d2
Compare
Thanks to @twiss for the test vector
D4954484
suggested changes
Aug 25, 2024
|
Apparently this was merged and immediatelly reverted? Was that a mistake? |
hubot
pushed a commit
that referenced
this pull request
Sep 13, 2024
hubot
pushed a commit
that referenced
this pull request
Sep 13, 2024
#1768 Implement message decryption using SEIPDv2 and PKESKv6 packets See merge request root/bc-java!25
|
In main as 58713da |
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.
This PR fixes decryption of messages which make use of version 6 Public-Key-Encrypted-Session-Key packets (PKESKv6) and version 2 Symmetrically-Encrypted-Integrity-Protected-Data packets (SEIPDv2).
Such packets are used for OpenPGP v6 style message encryption using AEAD.
This PR is currently based on #1752.Debugging the decryption was a bit messy, so expect some more cleanup :)