From 30e894a64ac18f9fdebd0d37108f2a84cab592ad Mon Sep 17 00:00:00 2001 From: Justin Richer Date: Wed, 18 Mar 2015 20:09:06 -0400 Subject: [PATCH] put 'kid' into JWS header, closes #784 --- .../connect/service/impl/DefaultOIDCTokenService.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultOIDCTokenService.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultOIDCTokenService.java index 3df5f1e99..ebbd6b156 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultOIDCTokenService.java +++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultOIDCTokenService.java @@ -183,7 +183,11 @@ public class DefaultOIDCTokenService implements OIDCTokenService { } else { idClaims.setCustomClaim("kid", jwtService.getDefaultSignerKeyId()); - idToken = new SignedJWT(new JWSHeader(signingAlg), idClaims); + JWSHeader header = new JWSHeader(signingAlg, null, null, null, null, null, null, null, null, null, + jwtService.getDefaultSignerKeyId(), + null, null); + + idToken = new SignedJWT(header, idClaims); // sign it with the server's key jwtService.signJwt((SignedJWT) idToken);