From 5f7c46aecd6e384a1f282af0d14e02f1eb360b50 Mon Sep 17 00:00:00 2001
From: Justin Richer <jricher@mitre.org>
Date: Thu, 28 Mar 2013 14:48:04 -0400
Subject: [PATCH] updated to nimbus 2.13

---
 ...SigningAndValidationServiceCacheService.java | 17 +++++++----------
 .../openid/connect/view/JwkKeyListView.java     | 16 ++++------------
 pom.xml                                         |  2 +-
 3 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/openid-connect-common/src/main/java/org/mitre/jwt/signer/service/impl/JWKSetSigningAndValidationServiceCacheService.java b/openid-connect-common/src/main/java/org/mitre/jwt/signer/service/impl/JWKSetSigningAndValidationServiceCacheService.java
index 2e0dcfb17..ea34958ff 100644
--- a/openid-connect-common/src/main/java/org/mitre/jwt/signer/service/impl/JWKSetSigningAndValidationServiceCacheService.java
+++ b/openid-connect-common/src/main/java/org/mitre/jwt/signer/service/impl/JWKSetSigningAndValidationServiceCacheService.java
@@ -11,7 +11,6 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
 
-import org.apache.commons.codec.binary.Base64;
 import org.apache.http.client.HttpClient;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.mitre.jwt.signer.service.JwtSigningAndValidationService;
@@ -22,14 +21,12 @@ import org.springframework.web.client.RestTemplate;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
-import com.google.common.collect.ImmutableMap;
-import com.nimbusds.jose.JWK;
-import com.nimbusds.jose.JWKSet;
-import com.nimbusds.jose.JWSSigner;
 import com.nimbusds.jose.JWSVerifier;
-import com.nimbusds.jose.KeyType;
-import com.nimbusds.jose.RSAKey;
 import com.nimbusds.jose.crypto.RSASSAVerifier;
+import com.nimbusds.jose.jwk.JWK;
+import com.nimbusds.jose.jwk.JWKSet;
+import com.nimbusds.jose.jwk.KeyType;
+import com.nimbusds.jose.jwk.RSAKey;
 
 /**
  * 
@@ -46,7 +43,7 @@ public class JWKSetSigningAndValidationServiceCacheService {
 	public JWKSetSigningAndValidationServiceCacheService() {
 		this.cache = CacheBuilder.newBuilder()
 				.maximumSize(100)
-				.build(new JWKSetFetcher());
+				.build(new JWKSetVerifierFetcher());
 	}
 	
 	/**
@@ -69,7 +66,7 @@ public class JWKSetSigningAndValidationServiceCacheService {
      * @author jricher
      *
      */
-    private class JWKSetFetcher extends CacheLoader<String, JwtSigningAndValidationService> {
+    private class JWKSetVerifierFetcher extends CacheLoader<String, JwtSigningAndValidationService> {
     	private HttpClient httpClient = new DefaultHttpClient();
     	private HttpComponentsClientHttpRequestFactory httpFactory = new HttpComponentsClientHttpRequestFactory(httpClient);
     	private RestTemplate restTemplate = new RestTemplate(httpFactory);
@@ -93,7 +90,7 @@ public class JWKSetSigningAndValidationServiceCacheService {
         			
 					byte[] modulusByte = rsa.getModulus().decode();
 					BigInteger modulus = new BigInteger(1, modulusByte);
-					byte[] exponentByte = rsa.getExponent().decode();
+					byte[] exponentByte = rsa.getPublicExponent().decode();
 					BigInteger exponent = new BigInteger(1, exponentByte);
 							
 					RSAPublicKeySpec spec = new RSAPublicKeySpec(modulus, exponent);
diff --git a/openid-connect-common/src/main/java/org/mitre/openid/connect/view/JwkKeyListView.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/view/JwkKeyListView.java
index 18408c159..22c2bf170 100644
--- a/openid-connect-common/src/main/java/org/mitre/openid/connect/view/JwkKeyListView.java
+++ b/openid-connect-common/src/main/java/org/mitre/openid/connect/view/JwkKeyListView.java
@@ -30,24 +30,16 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.codec.binary.Base64;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
-import org.springframework.validation.BeanPropertyBindingResult;
 import org.springframework.web.servlet.view.AbstractView;
 
-import com.google.gson.ExclusionStrategy;
-import com.google.gson.FieldAttributes;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import com.nimbusds.jose.JWK;
-import com.nimbusds.jose.JWKSet;
 import com.nimbusds.jose.JWSAlgorithm;
-import com.nimbusds.jose.RSAKey;
-import com.nimbusds.jose.Use;
+import com.nimbusds.jose.jwk.JWK;
+import com.nimbusds.jose.jwk.JWKSet;
+import com.nimbusds.jose.jwk.RSAKey;
+import com.nimbusds.jose.jwk.Use;
 import com.nimbusds.jose.util.Base64URL;
 
 /**
diff --git a/pom.xml b/pom.xml
index 1d25cfb47..2731e105e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -303,7 +303,7 @@
         <dependency>
         	<groupId>com.nimbusds</groupId>
         	<artifactId>nimbus-jose-jwt</artifactId>
-        	<version>2.11.0</version>
+        	<version>2.13.0</version>
         </dependency>
     </dependencies>
     <repositories>