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

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Jan 30 16:35:02 2015
New Revision: 4206

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4206&view=rev
Log:
Be conservative and limit scope of last cert chain checkin to just signing.  Don't want to unnecessarily cause possible interop problems if a cred being used for key transport is emitted with a chain.  

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=4206&r1=4205&r2=4206&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 Fri Jan 30 16:35:02 2015
@@ -252,15 +252,6 @@
      * @return a named KeyInfo generator manager instance
      */
     protected static NamedKeyInfoGeneratorManager buildSignatureKeyInfoGeneratorManager() {
-        return buildBasicKeyInfoGeneratorManager();
-    }
-    
-    /**
-     * Build a basic {@link NamedKeyInfoGeneratorManager}.
-     * 
-     * @return a named KeyInfo generator manager instance
-     */
-    public static NamedKeyInfoGeneratorManager buildBasicKeyInfoGeneratorManager() {
         NamedKeyInfoGeneratorManager namedManager = new NamedKeyInfoGeneratorManager();
         
         namedManager.setUseDefaultManager(true);
@@ -282,5 +273,32 @@
         
         return namedManager;
     }
+    
+    /**
+     * Build a basic {@link NamedKeyInfoGeneratorManager}.
+     * 
+     * @return a named KeyInfo generator manager instance
+     */
+    public static NamedKeyInfoGeneratorManager buildBasicKeyInfoGeneratorManager() {
+        NamedKeyInfoGeneratorManager namedManager = new NamedKeyInfoGeneratorManager();
+        
+        namedManager.setUseDefaultManager(true);
+        KeyInfoGeneratorManager defaultManager = namedManager.getDefaultManager();
+        
+        // Generator for basic Credentials
+        BasicKeyInfoGeneratorFactory basicFactory = new BasicKeyInfoGeneratorFactory();
+        basicFactory.setEmitPublicKeyValue(true);
+        basicFactory.setEmitPublicDEREncodedKeyValue(true);
+        basicFactory.setEmitKeyNames(true);
+        
+        // Generator for X509Credentials
+        X509KeyInfoGeneratorFactory x509Factory = new X509KeyInfoGeneratorFactory();
+        x509Factory.setEmitEntityCertificate(true);
+        
+        defaultManager.registerFactory(basicFactory);
+        defaultManager.registerFactory(x509Factory);
+        
+        return namedManager;
+    }
 
 }