[java-opensaml COMMIT] /trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/config/DefaultSecurityConfigurat...

[noreply at shibboleth.net]

Author: putmanb
Date: Wed May 28 20:04:48 2014
New Revision: 3900

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3900&view=rev
Log:
Pull out useless library default decryption KeyInfoCredentialResolver code.  These by definition need access to local creds, so can't be defaulted in the library.

Modified:
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/config/DefaultSecurityConfigurationBootstrap.java

Modified: trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/config/DefaultSecurityConfigurationBootstrap.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/config/DefaultSecurityConfigurationBootstrap.java?rev=3900&r1=3899&r2=3900&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/config/DefaultSecurityConfigurationBootstrap.java (original)
+++ trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/config/DefaultSecurityConfigurationBootstrap.java Wed May 28 20:04:48 2014
@@ -110,8 +110,6 @@
                 EncryptionConstants.ALGO_ID_KEYTRANSPORT_RSA15
                 ));
         
-        config.setDataKeyInfoCredentialResolver(buildEncryptionDataKeyInfoCredentialResolver());
-        config.setKEKKeyInfoCredentialResolver(buildEncryptionKEKKeyInfoCredentialResolver());
         config.setEncryptedKeyResolver(buildBasicEncryptedKeyResolver());
         
         return config;
@@ -203,28 +201,6 @@
         return new ChainingEncryptedKeyResolver(resolverChain);
     }
 
-    /**
-     * Build a basic instance of {@link KeyInfoCredentialResolver} for handling
-     * {@link org.opensaml.xmlsec.signature.KeyInfo} instances located within an
-     * {@link org.opensaml.xmlsec.encryption.EncryptedData}.
-     * 
-     * @return a KeyInfo credential resolver instance
-     */
-    protected static KeyInfoCredentialResolver buildEncryptionDataKeyInfoCredentialResolver() {
-        return buildBasicInlineKeyInfoCredentialResolver();
-    }
-    
-    /**
-     * Build a basic instance of {@link KeyInfoCredentialResolver} for handling
-     * {@link org.opensaml.xmlsec.signature.KeyInfo} instances located within an
-     * {@link org.opensaml.xmlsec.encryption.EncryptedKey}.
-     * 
-     * @return a KeyInfo credential resolver instance
-     */
-    protected static KeyInfoCredentialResolver buildEncryptionKEKKeyInfoCredentialResolver() {
-        return buildBasicInlineKeyInfoCredentialResolver();
-    }
-    
     /**
      * Build a basic instance of {@link KeyInfoCredentialResolver}.
      *