[OID4VCI] Implement Key-Binding for jwt-credentials and fix it for SD-JWT#49895
Merged
mposolda merged 6 commits intoJul 24, 2026
Merged
Conversation
wistefan
force-pushed
the
46273-49891-implement-key-binding
branch
from
June 11, 2026 08:51
9253dd1 to
59074e4
Compare
Contributor
|
Thanks @wistefan, for the PR. It looks like the DCO checks are currently failing. Could you please take a look when you have a chance? |
wistefan
force-pushed
the
46273-49891-implement-key-binding
branch
from
June 11, 2026 09:04
59074e4 to
c902f05
Compare
10 tasks
Awambeng
suggested changes
Jun 16, 2026
Awambeng
left a comment
Contributor
There was a problem hiding this comment.
Hi @wistefan,
Thanks for the PR. I have left a few minor comments, could you please take a look when you get a chance?
I also noticed that the commits are unverified and some CI checks are failing. Could you please check those as well?
Thanks!
| return this; | ||
| } | ||
|
|
||
Contributor
There was a problem hiding this comment.
Could you please remove the extra whitespace?
| this.issuerSignedJWT = issuerSignedJWT; | ||
| } | ||
|
|
||
Contributor
|
@mposolda Could you please help us with the review of this PR ? |
jordandunmire97-ai
approved these changes
Jun 28, 2026
wistefan
marked this pull request as draft
June 29, 2026 08:01
wistefan
marked this pull request as ready for review
June 29, 2026 08:02
Contributor
There was a problem hiding this comment.
Pull request overview
Implements holder key-binding for JWT credentials in OID4VCI issuance and fixes SD-JWT key-binding so the cnf claim is retained when default decoys are generated.
Changes:
- Implement key-binding for JWT credentials by adding a
cnf.jwkclaim at signing time. - Fix SD-JWT key-binding by treating
cnfas a visible SD-JWT claim rather than mutating the issuer payload directly. - Extend/adjust tests to validate presence of
cnfacross SD-JWT decoy configurations and for JWT credentials.
Reviewed changes
Copilot reviewed 7 out of 7 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| tests/base/src/test/java/org/keycloak/tests/oid4vc/issuance/signing/LDCredentialSignerTest.java | Updates test construction for JwtCredentialBody after API change. |
| tests/base/src/test/java/org/keycloak/tests/oid4vc/issuance/credentialbuilder/SdJwtCredentialBuilderTest.java | Adds parameterized coverage ensuring cnf survives with 0/default and explicit decoys. |
| tests/base/src/test/java/org/keycloak/tests/oid4vc/issuance/credentialbuilder/JwtCredentialBuilderTest.java | Adds test ensuring cnf.jwk is embedded into JWT credentials when key-binding is applied. |
| services/src/main/java/org/keycloak/protocol/oid4vc/issuance/credentialbuilder/SdJwtCredentialBody.java | Changes key-binding injection to add cnf as a visible SD-JWT claim. |
| services/src/main/java/org/keycloak/protocol/oid4vc/issuance/credentialbuilder/JwtCredentialBuilder.java | Adjusts builder to pass JsonWebToken into JwtCredentialBody so late mutations are signed. |
| services/src/main/java/org/keycloak/protocol/oid4vc/issuance/credentialbuilder/JwtCredentialBody.java | Implements JWT key-binding by writing cnf.jwk into the token’s other claims and signing the updated token. |
| core/src/main/java/org/keycloak/sdjwt/SdJwt.java | Refactors default-decoy handling so disclosure payload regeneration happens consistently. |
Signed-off-by: Stefan Wiedemann <wistefan@googlemail.com>
Signed-off-by: Stefan Wiedemann <wistefan@googlemail.com>
Signed-off-by: Stefan Wiedemann <wistefan@googlemail.com>
…redentialbuilder/SdJwtCredentialBody.java Co-authored-by: Awambeng <114798938+Awambeng@users.noreply.github.com> Signed-off-by: Stefan Wiedemann <stefan.wiedemann@seamware.com>
Signed-off-by: Stefan Wiedemann <wistefan@googlemail.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> Signed-off-by: Stefan Wiedemann <stefan.wiedemann@seamware.com>
wistefan
force-pushed
the
46273-49891-implement-key-binding
branch
from
June 30, 2026 09:49
82f037c to
770253f
Compare
mposolda
approved these changes
Jul 24, 2026
mposolda
left a comment
Contributor
There was a problem hiding this comment.
@wistefan @Awambeng @VinodAnandan @jordandunmire97-ai Thanks for this PR and for the reviews!
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
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.
closes #49891
This PR: