From a38dc0ce29ad94a1d717d105c9d755d35d21430d Mon Sep 17 00:00:00 2001
From: Justin Richer <jricher@mitre.org>
Date: Tue, 19 Jun 2012 16:24:50 -0400
Subject: [PATCH] added crypto configuration file

---
 openid-connect-server/.springBeans            |  1 +
 .../main/webapp/WEB-INF/spring-servlet.xml    | 27 +------------------
 2 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/openid-connect-server/.springBeans b/openid-connect-server/.springBeans
index d54509e13..3a424e222 100644
--- a/openid-connect-server/.springBeans
+++ b/openid-connect-server/.springBeans
@@ -11,6 +11,7 @@
 		<config>src/main/webapp/WEB-INF/server-config.xml</config>
 		<config>src/main/webapp/WEB-INF/local-config.xml</config>
 		<config>src/main/webapp/WEB-INF/data-context.xml</config>
+		<config>src/main/webapp/WEB-INF/crypto-config.xml</config>
 	</configs>
 	<configSets>
 	</configSets>
diff --git a/openid-connect-server/src/main/webapp/WEB-INF/spring-servlet.xml b/openid-connect-server/src/main/webapp/WEB-INF/spring-servlet.xml
index b2963f76b..f47359107 100644
--- a/openid-connect-server/src/main/webapp/WEB-INF/spring-servlet.xml
+++ b/openid-connect-server/src/main/webapp/WEB-INF/spring-servlet.xml
@@ -133,32 +133,7 @@
 
 	<!-- Crypto -->
 
-	<bean id="defaultKeystore" class="org.mitre.jwt.signer.service.impl.KeyStore">
-		<constructor-arg name="location" value="classpath:keystore.jks" />
-		<constructor-arg name="password" value="changeit" />
-	</bean>
-
-	<bean id="defaultsignerService"
-		class="org.mitre.jwt.signer.service.impl.JwtSigningAndValidationServiceDefault">
-		<property name="signers">
-			<map>
-				<entry key="rsa1">
-					<bean id="rsaSigner" class="org.mitre.jwt.signer.impl.RsaSigner">
-						<property name="algorithm" value="RS256" />
-						<property name="keystore" ref="defaultKeystore" />
-						<property name="alias" value="rsa" />
-						<property name="password" value="changeit" />
-					</bean>
-				</entry>
-				<entry key="hmac1">
-					<bean id="hmacSigner" class="org.mitre.jwt.signer.impl.HmacSigner">
-						<property name="algorithm" value="HS256" />
-						<property name="passphrase" value="changeit" />
-					</bean>
-				</entry>
-			</map>
-		</property>
-	</bean>
+	<import resource="crypto-config.xml" />
 
 	<!-- End Crypto -->