[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/idp.properties system/conf/relying-party-...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Jun 18 23:05:35 2014
New Revision: 6117

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6117&view=rev
Log:
Add a basic SHA1/SHA2 switch.

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

Modified: trunk/idp-conf/src/main/resources/conf/idp.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/idp.properties?rev=6117&r1=6116&r2=6117&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Wed Jun 18 23:05:35 2014
@@ -22,6 +22,9 @@
 idp.encryption.cert = ${idp.home}/creds/idp-encryption.crt
 #idp.encryption.key.2 = ${idp.home}/creds/idp-encryption-old.key
 #idp.encryption.cert.2 = ${idp.home}/creds/idp-encryption-old.crt
+
+# To default to SHA-1, set to shibboleth.SigningConfiguration.SHA1
+#idp.signing.config = shibboleth.SigningConfiguration.SHA256
 
 # Configures the primary server-side storage plugin
 #idp.storage.StorageService = org.opensaml.storage.impl.MemoryStorageService

Modified: trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml?rev=6117&r1=6116&r2=6117&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml Wed Jun 18 23:05:35 2014
@@ -90,23 +90,7 @@
     <bean id="shibboleth.DefaultSecurityConfiguration" class="net.shibboleth.idp.profile.config.SecurityConfiguration">
     
         <property name="signatureSigningConfiguration">
-            <bean class="org.opensaml.xmlsec.impl.BasicSignatureSigningConfiguration"
-                    p:signingCredentials-ref="shibboleth.DefaultSigningCredential">
-                <property name="signatureAlgorithms">
-                    <util:list>
-                        <util:constant
-                            static-field="org.opensaml.xmlsec.signature.support.SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA256" />
-                        <util:constant
-                            static-field="org.opensaml.xmlsec.signature.support.SignatureConstants.ALGO_ID_SIGNATURE_ECDSA_SHA256" />
-                    </util:list>
-                </property>
-                <property name="signatureReferenceDigestMethods">
-                    <util:list>
-                        <util:constant
-                            static-field="org.opensaml.xmlsec.signature.support.SignatureConstants.ALGO_ID_DIGEST_SHA256" />
-                    </util:list>
-                </property>
-            </bean>
+            <ref bean="${idp.signing.config:shibboleth.SigningConfiguration.SHA256}" />
         </property>
         
         <property name="encryptionConfiguration">
@@ -132,6 +116,42 @@
                 p:encryptedKeyResolver-ref="defaultEncryptedKeyResolver" />
         </property>
 
+    </bean>
+
+    <bean id="shibboleth.SigningConfiguration.SHA256" class="org.opensaml.xmlsec.impl.BasicSignatureSigningConfiguration"
+            p:signingCredentials-ref="shibboleth.DefaultSigningCredential">
+        <property name="signatureAlgorithms">
+            <util:list>
+                <util:constant
+                    static-field="org.opensaml.xmlsec.signature.support.SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA256" />
+                <util:constant
+                    static-field="org.opensaml.xmlsec.signature.support.SignatureConstants.ALGO_ID_SIGNATURE_ECDSA_SHA256" />
+            </util:list>
+        </property>
+        <property name="signatureReferenceDigestMethods">
+            <util:list>
+                <util:constant
+                    static-field="org.opensaml.xmlsec.signature.support.SignatureConstants.ALGO_ID_DIGEST_SHA256" />
+            </util:list>
+        </property>
+    </bean>
+
+    <bean id="shibboleth.SigningConfiguration.SHA1" class="org.opensaml.xmlsec.impl.BasicSignatureSigningConfiguration"
+            p:signingCredentials-ref="shibboleth.DefaultSigningCredential">
+        <property name="signatureAlgorithms">
+            <util:list>
+                <util:constant
+                    static-field="org.opensaml.xmlsec.signature.support.SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA1" />
+                <util:constant
+                    static-field="org.opensaml.xmlsec.signature.support.SignatureConstants.ALGO_ID_SIGNATURE_ECDSA_SHA1" />
+            </util:list>
+        </property>
+        <property name="signatureReferenceDigestMethods">
+            <util:list>
+                <util:constant
+                    static-field="org.opensaml.xmlsec.signature.support.SignatureConstants.ALGO_ID_DIGEST_SHA1" />
+            </util:list>

[... 5 lines stripped ...]