[java-identity-provider COMMIT] /trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingpart...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Apr 14 03:59:00 2014
New Revision: 5722

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5722&view=rev
Log:
IDP-390 StaticExplicitKeySignatureTrustEngine not StaticExplicitKeyTrustEngine

Modified:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/StaticExplicitKeySignatureParser.java

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/StaticExplicitKeySignatureParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/StaticExplicitKeySignatureParser.java?rev=5722&r1=5721&r2=5722&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/StaticExplicitKeySignatureParser.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/StaticExplicitKeySignatureParser.java Mon Apr 14 03:59:00 2014
@@ -17,6 +17,7 @@
 
 package net.shibboleth.idp.profile.spring.relyingparty.security.trustengine;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import javax.xml.namespace.QName;
@@ -27,7 +28,12 @@
 import net.shibboleth.utilities.java.support.xml.ElementSupport;
 
 import org.opensaml.security.credential.impl.StaticCredentialResolver;
-import org.opensaml.security.trust.impl.ExplicitKeyTrustEngine;
+import org.opensaml.xmlsec.keyinfo.impl.BasicProviderKeyInfoCredentialResolver;
+import org.opensaml.xmlsec.keyinfo.impl.KeyInfoProvider;
+import org.opensaml.xmlsec.keyinfo.impl.provider.DSAKeyValueProvider;
+import org.opensaml.xmlsec.keyinfo.impl.provider.InlineX509DataProvider;
+import org.opensaml.xmlsec.keyinfo.impl.provider.RSAKeyValueProvider;
+import org.opensaml.xmlsec.signature.support.impl.ExplicitKeySignatureTrustEngine;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.w3c.dom.Element;
@@ -42,7 +48,7 @@
 
     /** {@inheritDoc} */
     @Override protected Class<?> getBeanClass(Element element) {
-        return ExplicitKeyTrustEngine.class;
+        return ExplicitKeySignatureTrustEngine.class;
     }
 
     /** {@inheritDoc} */
@@ -57,5 +63,11 @@
         resolver.addConstructorArgValue(SpringSupport.parseCustomElements(credentials, parserContext));
 
         builder.addConstructorArgValue(resolver.getBeanDefinition());
+        
+        List<KeyInfoProvider> keyInfoProviders = new ArrayList<KeyInfoProvider>();
+        keyInfoProviders.add(new DSAKeyValueProvider());
+        keyInfoProviders.add(new RSAKeyValueProvider());
+        keyInfoProviders.add(new InlineX509DataProvider());
+        builder.addConstructorArgValue(new BasicProviderKeyInfoCredentialResolver(keyInfoProviders));
     }
 }