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

[noreply at shibboleth.net]

Author: scantor
Date: Thu Jun 19 11:48:36 2014
New Revision: 6120

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6120&view=rev
Log:
Per-discussion, don't default an encryption key using signing key property.

Modified:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAMLProfileConfigurationParser.java

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAMLProfileConfigurationParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAMLProfileConfigurationParser.java?rev=6120&r1=6119&r2=6120&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAMLProfileConfigurationParser.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAMLProfileConfigurationParser.java Thu Jun 19 11:48:36 2014
@@ -31,9 +31,7 @@
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.xml.ElementSupport;
 
-import org.opensaml.xmlsec.impl.BasicDecryptionConfiguration;
 import org.opensaml.xmlsec.impl.BasicSignatureSigningConfiguration;
-import org.opensaml.xmlsec.keyinfo.impl.StaticKeyInfoCredentialResolver;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.BeanFactory;
@@ -229,22 +227,9 @@
                 BeanDefinitionBuilder.genericBeanDefinition(BasicSignatureSigningConfiguration.class);
         signingConfiguration.addPropertyReference("signingCredentials", credentialRef);
         
-        final BeanDefinitionBuilder decryptionConfiguration =
-                BeanDefinitionBuilder.genericBeanDefinition(BasicDecryptionConfiguration.class);
-        
-        decryptionConfiguration.addPropertyReference("encryptedKeyResolver", DEFAULT_EKR);
-        
-        final BeanDefinitionBuilder staticKeyInfoCredentialResolver =
-                BeanDefinitionBuilder.genericBeanDefinition(StaticKeyInfoCredentialResolver.class);
-        staticKeyInfoCredentialResolver.addConstructorArgReference(credentialRef);
-        
-        decryptionConfiguration.addPropertyValue("KEKKeyInfoCredentialResolver",
-                staticKeyInfoCredentialResolver.getBeanDefinition());
-        
         final BeanDefinitionBuilder configuration =
                 BeanDefinitionBuilder.genericBeanDefinition(SecurityConfiguration.class);
         configuration.addPropertyValue("signatureSigningConfiguration", signingConfiguration.getBeanDefinition());
-        configuration.addPropertyValue("decryptionConfiguration", decryptionConfiguration.getBeanDefinition());
 
         builder.addPropertyValue("securityConfiguration", configuration.getBeanDefinition());
     }