Merge pull request mitreid-connect#1352 from blm126/upgrade-nimbus

Upgrade nimbus-jose-jwt to 5.4.

Author: jricher

openid-connect-client/src/test/java/org/mitre/openid/connect/client/service/impl/TestSignedAuthRequestUrlBuilder.java

@@ -92,7 +92,7 @@ public class TestSignedAuthRequestUrlBuilder {
 @Before
 public void prepare() throws NoSuchAlgorithmException, InvalidKeySpecException {
 
-RSAKey key = new RSAKey(new Base64URL(n), new Base64URL(e), new Base64URL(d), KeyUse.SIGNATURE, null, new Algorithm(alg), kid, null, null, null, null);
+RSAKey key = new RSAKey(new Base64URL(n), new Base64URL(e), new Base64URL(d), KeyUse.SIGNATURE, null, new Algorithm(alg), kid, null, null, null, null, null);
 Map<String, JWK> keys = Maps.newHashMap();
 keys.put("client", key);
 

openid-connect-common/src/main/java/org/mitre/jwt/signer/service/impl/SymmetricKeyJWTValidatorCacheService.java

@@ -99,8 +99,10 @@ public JWTSigningAndValidationService load(String key) throws Exception {
 try {
 
 String id = "SYMMETRIC-KEY";
-
-JWK jwk = new OctetSequenceKey(Base64URL.encode(key), KeyUse.SIGNATURE, null, null, id, null, null, null, null);
+JWK jwk = new OctetSequenceKey.Builder(Base64URL.encode(key))
+.keyUse(KeyUse.SIGNATURE)
+.keyID(id)
+.build();
 Map<String, JWK> keys = ImmutableMap.of(id, jwk);
 JWTSigningAndValidationService service = new DefaultJWTSigningAndValidationService(keys);
 

openid-connect-common/src/test/java/org/mitre/jose/TestJWKSetKeyStore.java

@@ -61,7 +61,7 @@ public class TestJWKSetKeyStore {
 "qDp0Vqj3kbSCz1XyfCs6_LehBwtxHIyh8Ripy40p24moOAbgxVw3rxT_vl" +
 "t3UVe4WO3JkJOzlpUf-KTVI2Ptgm-dARxTEtE-id-4OJr0h-K-VFs3VSnd" +
 "VTIznSxfyrj8ILL6MG_Uv8YAu7VILSB3lOW085-4qE3DzgrTjgyQ"), // d
-KeyUse.ENCRYPTION, null, JWEAlgorithm.RSA_OAEP, RSAkid, null, null, null, null);
+KeyUse.ENCRYPTION, null, JWEAlgorithm.RSA_OAEP, RSAkid, null, null, null, null, null);
 
 private String RSAkid_rsa2 = "rsa_2";
 private JWK RSAjwk_rsa2 = new RSAKey(
@@ -78,7 +78,7 @@ public class TestJWKSetKeyStore {
 "qDp0Vqj3kbSCz1XyfCs6_LehBwtxHIyh8Ripy40p24moOAbgxVw3rxT_vl" +
 "t3UVe4WO3JkJOzlpUf-KTVI2Ptgm-dARxTEtE-id-4OJr0h-K-VFs3VSnd" +
 "VTIznSxfyrj8ILL6MG_Uv8YAu7VILSB3lOW085-4qE3DzgrTjgyQ"), // d
-KeyUse.ENCRYPTION, null, JWEAlgorithm.RSA1_5, RSAkid_rsa2, null, null, null, null);
+KeyUse.ENCRYPTION, null, JWEAlgorithm.RSA1_5, RSAkid_rsa2, null, null, null, null, null);
 
 
 List<JWK> keys_list = new LinkedList<>();

openid-connect-common/src/test/java/org/mitre/jwt/encryption/service/impl/TestDefaultJWTEncryptionAndDecryptionService.java

@@ -106,7 +106,7 @@ public class TestDefaultJWTEncryptionAndDecryptionService {
 "qDp0Vqj3kbSCz1XyfCs6_LehBwtxHIyh8Ripy40p24moOAbgxVw3rxT_vl" +
 "t3UVe4WO3JkJOzlpUf-KTVI2Ptgm-dARxTEtE-id-4OJr0h-K-VFs3VSnd" +
 "VTIznSxfyrj8ILL6MG_Uv8YAu7VILSB3lOW085-4qE3DzgrTjgyQ"), // d
-KeyUse.ENCRYPTION, null, JWEAlgorithm.RSA_OAEP, RSAkid, null, null, null, null);
+KeyUse.ENCRYPTION, null, JWEAlgorithm.RSA_OAEP, RSAkid, null, null, null, null, null);
 
 private String RSAkid_2 = "rsa3210";
 private JWK RSAjwk_2 = new RSAKey(
@@ -123,12 +123,12 @@ public class TestDefaultJWTEncryptionAndDecryptionService {
 "qDp0Vqj3kbSCz1XyfCs6_LehBwtxHIyh8Ripy40p24moOAbgxVw3rxT_vl" +
 "t3UVe4WO3JkJOzlpUf-KTVI2Ptgm-dARxTEtE-id-4OJr0h-K-VFs3VSnd" +
 "VTIznSxfyrj8ILL6MG_Uv8YAu7VILSB3lOW085-4qE3DzgrTjgyQ"), // d
-KeyUse.ENCRYPTION, null, JWEAlgorithm.RSA1_5, RSAkid_2, null, null, null, null);
+KeyUse.ENCRYPTION, null, JWEAlgorithm.RSA1_5, RSAkid_2, null, null, null, null, null);
 
 private String AESkid = "aes123";
 private JWK AESjwk = new OctetSequenceKey(new Base64URL("GawgguFyGrWKav7AX4VKUg"),
 KeyUse.ENCRYPTION, null, JWEAlgorithm.A128KW,
-AESkid, null, null, null, null);
+AESkid, null, null, null, null, null);
 
 
 private Map<String, JWK> keys = new ImmutableMap.Builder<String, JWK>()

pom.xml

@@ -585,7 +585,7 @@
 <dependency>
 <groupId>com.nimbusds</groupId>
 <artifactId>nimbus-jose-jwt</artifactId>
-<version>4.34.2</version>
+<version>5.4</version>
 </dependency>
 <dependency>
 <groupId>org.bouncycastle</groupId>