[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/logback.xml conf/profile-defaults.xml con...

[noreply at shibboleth.net]

Author: scantor
Date: Mon May 12 15:24:59 2014
New Revision: 5915

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5915&view=rev
Log:
Update security configuration resolvers to SAML versions.

Modified:
    trunk/idp-conf/src/main/resources/conf/logback.xml
    trunk/idp-conf/src/main/resources/conf/profile-defaults.xml
    trunk/idp-conf/src/main/resources/conf/relying-party-native.xml
    trunk/idp-conf/src/main/resources/conf/relying-party.xml
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml

Modified: trunk/idp-conf/src/main/resources/conf/logback.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/logback.xml?rev=5915&r1=5914&r2=5915&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/logback.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/logback.xml Mon May 12 15:24:59 2014
@@ -33,6 +33,8 @@
 
     <logger name="org.opensaml.storage" level="TRACE" />
 
+    <logger name="org.opensaml.xmlsec" level="DEBUG" />
+
     <!-- Do not log exception when bean definition class is a property and root level is DEBUG. -->
     <logger name="org.springframework.beans.factory.support.DefaultListableBeanFactory" level="INFO" />
 

Modified: trunk/idp-conf/src/main/resources/conf/profile-defaults.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/profile-defaults.xml?rev=5915&r1=5914&r2=5915&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/profile-defaults.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/profile-defaults.xml Mon May 12 15:24:59 2014
@@ -92,14 +92,14 @@
             <bean class="org.opensaml.xmlsec.impl.BasicEncryptionConfiguration">
                 <property name="dataEncryptionAlgorithms">
                     <util:list>
+                        <util:constant static-field="org.opensaml.xmlsec.encryption.support.EncryptionConstants.ALGO_ID_BLOCKCIPHER_AES128" />
                         <util:constant static-field="org.opensaml.xmlsec.encryption.support.EncryptionConstants.ALGO_ID_BLOCKCIPHER_AES128_GCM" />
-                        <util:constant static-field="org.opensaml.xmlsec.encryption.support.EncryptionConstants.ALGO_ID_BLOCKCIPHER_AES128" />
                     </util:list>
                 </property>
                 <property name="keyTransportEncryptionAlgorithms">
                     <util:list>
+                        <util:constant static-field="org.opensaml.xmlsec.encryption.support.EncryptionConstants.ALGO_ID_KEYTRANSPORT_RSAOAEP" />
                         <util:constant static-field="org.opensaml.xmlsec.encryption.support.EncryptionConstants.ALGO_ID_KEYTRANSPORT_RSAOAEP11" />
-                        <util:constant static-field="org.opensaml.xmlsec.encryption.support.EncryptionConstants.ALGO_ID_KEYTRANSPORT_RSAOAEP" />
                     </util:list>
                 </property>
             </bean>

Modified: trunk/idp-conf/src/main/resources/conf/relying-party-native.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/relying-party-native.xml?rev=5915&r1=5914&r2=5915&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/relying-party-native.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/relying-party-native.xml Mon May 12 15:24:59 2014
@@ -73,14 +73,14 @@
             <bean class="org.opensaml.xmlsec.impl.BasicEncryptionConfiguration">
                 <property name="dataEncryptionAlgorithms">
                     <util:list>
+                        <util:constant static-field="org.opensaml.xmlsec.encryption.support.EncryptionConstants.ALGO_ID_BLOCKCIPHER_AES128" />
                         <util:constant static-field="org.opensaml.xmlsec.encryption.support.EncryptionConstants.ALGO_ID_BLOCKCIPHER_AES128_GCM" />
-                        <util:constant static-field="org.opensaml.xmlsec.encryption.support.EncryptionConstants.ALGO_ID_BLOCKCIPHER_AES128" />
                     </util:list>
                 </property>
                 <property name="keyTransportEncryptionAlgorithms">
                     <util:list>
+                        <util:constant static-field="org.opensaml.xmlsec.encryption.support.EncryptionConstants.ALGO_ID_KEYTRANSPORT_RSAOAEP" />
                         <util:constant static-field="org.opensaml.xmlsec.encryption.support.EncryptionConstants.ALGO_ID_KEYTRANSPORT_RSAOAEP11" />
-                        <util:constant static-field="org.opensaml.xmlsec.encryption.support.EncryptionConstants.ALGO_ID_KEYTRANSPORT_RSAOAEP" />
                     </util:list>
                 </property>
             </bean>

Modified: trunk/idp-conf/src/main/resources/conf/relying-party.xml

[... 86 lines stripped ...]