Skip to content

Updates to key accessors and fix proof algorithm type #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Korbik merged 3 commits into from
Jul 10, 2025
Merged

Updates to key accessors and fix proof algorithm type #124

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
870de8e
Remove cached revocation identifiers from `UnverifiedBiscuit`.
preuss-adam Apr 25, 2025
0b8699c
Augment `UnverifiedBiscuit` with external key accessors.
preuss-adam Apr 25, 2025
edbb12e
Fix algorithm type of proof.
preuss-adam May 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions src/main/java/org/eclipse/biscuit/token/format/SerializedBiscuit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,13 +172,18 @@ private static SerializedBiscuit deserialize(Schema.Biscuit data)
throw new Error.FormatError.DeserializationError("invalid proof");
}

final Proof proof =
data.getProof().hasFinalSignature()
? new Proof.FinalSignature(data.getProof().getFinalSignature().toByteArray())
: new Proof.NextSecret(
KeyPair.generate(
authority.getKey().getAlgorithm(),
Copy link
Contributor

@Geal Geal Jun 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice catch, thanks

data.getProof().getNextSecret().toByteArray()));
final Proof proof;
if (data.getProof().hasFinalSignature()) {
proof = new Proof.FinalSignature(data.getProof().getFinalSignature().toByteArray());
} else {
final Schema.PublicKey.Algorithm proofAlgorithm =
blocks.isEmpty()
? authority.getKey().getAlgorithm()
: blocks.get(blocks.size() - 1).getKey().getAlgorithm();
proof =
new Proof.NextSecret(
KeyPair.generate(proofAlgorithm, data.getProof().getNextSecret().toByteArray()));
}

Option<Integer> rootKeyId =
data.hasRootKeyId() ? Option.some(data.getRootKeyId()) : Option.none();
Expand Down