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

[noreply at shibboleth.net]

Author: putmanb
Date: Thu Sep 25 13:39:28 2014
New Revision: 4066

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4066&view=rev
Log:
Re-enable default RSAOAEPParameters values, but now with SHA-1 variants.

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=4066&r1=4065&r2=4066&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 Thu Sep 25 13:39:28 2014
@@ -93,13 +93,11 @@
                 EncryptionConstants.ALGO_ID_KEYWRAP_TRIPLEDES
                 ));
         
-        /* TODO this is causing a problem in idp-conf tests due to some weird XML namespace problem
         config.setRSAOAEPParameters(new RSAOAEPParameters(
-                EncryptionConstants.ALGO_ID_DIGEST_SHA256, 
-                EncryptionConstants.ALGO_ID_MGF1_SHA256, 
+                SignatureConstants.ALGO_ID_DIGEST_SHA1, 
+                EncryptionConstants.ALGO_ID_MGF1_SHA1, 
                 null
                 ));
-         */
         
         config.setDataKeyInfoGeneratorManager(buildDataEncryptionKeyInfoGeneratorManager());
         config.setKeyTransportKeyInfoGeneratorManager(buildKeyTransportEncryptionKeyInfoGeneratorManager());