[java-identity-provider] branch master updated: OSJ-318 - Deprecate terms from classes and configuration

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=5d0ceb7e44e0f34356501397f90ab9f6da1e72db

The following commit(s) were added to refs/heads/master by this push:
       new  5d0ceb7e4 OSJ-318 - Deprecate terms from classes and configuration
5d0ceb7e4 is described below

commit 5d0ceb7e44e0f34356501397f90ab9f6da1e72db
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Jun 11 13:18:03 2020 -0400

    OSJ-318 - Deprecate terms from classes and configuration
    
    https://issues.shibboleth.net/jira/browse/OSJ-318
    
    Adjust property names.
---
 .../src/main/resources/system/conf/global-system.xml     | 16 ++++++++--------
 .../resources/system/conf/metadata-providers-system.xml  |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/idp-conf/src/main/resources/system/conf/global-system.xml b/idp-conf/src/main/resources/system/conf/global-system.xml
index c0119121c..76f790572 100644
--- a/idp-conf/src/main/resources/system/conf/global-system.xml
+++ b/idp-conf/src/main/resources/system/conf/global-system.xml
@@ -290,8 +290,8 @@
     
     <bean id="shibboleth.BasicSignatureValidationConfiguration" abstract="true"
         class="org.opensaml.xmlsec.impl.BasicSignatureValidationConfiguration"
-        p:whitelistedAlgorithms="#{getObject('shibboleth.IncludedSignatureAlgorithms') ?: getObject('shibboleth.SignatureWhitelist')}"
-        p:blacklistedAlgorithms="#{getObject('shibboleth.ExcludedSignatureAlgorithms') ?: getObject('shibboleth.SignatureBlacklist')}" />
+        p:includedAlgorithms="#{getObject('shibboleth.IncludedSignatureAlgorithms') ?: getObject('shibboleth.SignatureWhitelist')}"
+        p:excludedAlgorithms="#{getObject('shibboleth.ExcludedSignatureAlgorithms') ?: getObject('shibboleth.SignatureBlacklist')}" />
     
     <bean id="shibboleth.BasicClientTLSValidationConfiguration" abstract="true"
         class="org.opensaml.security.x509.tls.impl.BasicClientTLSValidationConfiguration" />
@@ -301,18 +301,18 @@
     
     <bean id="shibboleth.BasicSignatureSigningConfiguration" abstract="true"
         class="org.opensaml.xmlsec.impl.BasicSignatureSigningConfiguration"
-        p:whitelistedAlgorithms="#{getObject('shibboleth.IncludedSignatureAlgorithms') ?: getObject('shibboleth.SignatureWhitelist')}"
-        p:blacklistedAlgorithms="#{getObject('shibboleth.ExcludedSignatureAlgorithms') ?: getObject('shibboleth.SignatureBlacklist')}" />
+        p:includedAlgorithms="#{getObject('shibboleth.IncludedSignatureAlgorithms') ?: getObject('shibboleth.SignatureWhitelist')}"
+        p:excludedAlgorithms="#{getObject('shibboleth.ExcludedSignatureAlgorithms') ?: getObject('shibboleth.SignatureBlacklist')}" />
     
     <bean id="shibboleth.BasicEncryptionConfiguration" abstract="true"
         class="org.opensaml.xmlsec.impl.BasicEncryptionConfiguration"
-        p:whitelistedAlgorithms="#{getObject('shibboleth.IncludedEncryptionAlgorithms') ?: getObject('shibboleth.EncryptionWhitelist')}"
-        p:blacklistedAlgorithms="#{getObject('shibboleth.ExcludedEncryptionAlgorithms') ?: getObject('shibboleth.EncryptionBlacklist')}" />
+        p:includedAlgorithms="#{getObject('shibboleth.IncludedEncryptionAlgorithms') ?: getObject('shibboleth.EncryptionWhitelist')}"
+        p:excludedAlgorithms="#{getObject('shibboleth.ExcludedEncryptionAlgorithms') ?: getObject('shibboleth.EncryptionBlacklist')}" />
 
     <bean id="shibboleth.BasicDecryptionConfiguration" abstract="true"
         class="org.opensaml.xmlsec.impl.BasicDecryptionConfiguration"
-        p:whitelistedAlgorithms="#{getObject('shibboleth.IncludedEncryptionAlgorithms') ?: getObject('shibboleth.EncryptionWhitelist')}"
-        p:blacklistedAlgorithms="#{getObject('shibboleth.ExcludedEncryptionAlgorithms') ?: getObject('shibboleth.EncryptionBlacklist')}" />
+        p:includedAlgorithms="#{getObject('shibboleth.IncludedEncryptionAlgorithms') ?: getObject('shibboleth.EncryptionWhitelist')}"
+        p:excludedAlgorithms="#{getObject('shibboleth.ExcludedEncryptionAlgorithms') ?: getObject('shibboleth.EncryptionBlacklist')}" />
 
     <!-- Beans that implement the mashing of security configurations into final parameter sets. -->
     
diff --git a/idp-conf/src/main/resources/system/conf/metadata-providers-system.xml b/idp-conf/src/main/resources/system/conf/metadata-providers-system.xml
index 24e6420ee..11ad44185 100644
--- a/idp-conf/src/main/resources/system/conf/metadata-providers-system.xml
+++ b/idp-conf/src/main/resources/system/conf/metadata-providers-system.xml
@@ -39,8 +39,8 @@
         <property name="signatureValidationConfigurations">
             <list>
                 <bean parent="shibboleth.BasicSignatureValidationConfiguration" 
-                    p:whitelistedAlgorithms="#{getObject('shibboleth.IncludedSignatureAlgorithms') ?: getObject('shibboleth.SignatureWhitelist')}"
-                    p:blacklistedAlgorithms="#{getObject('shibboleth.ExcludedSignatureAlgorithms') ?: getObject('shibboleth.SignatureBlacklist')}" />
+                    p:includedAlgorithms="#{getObject('shibboleth.IncludedSignatureAlgorithms') ?: getObject('shibboleth.SignatureWhitelist')}"
+                    p:excludedAlgorithms="#{getObject('shibboleth.ExcludedSignatureAlgorithms') ?: getObject('shibboleth.SignatureBlacklist')}" />
             </list>
         </property>
     </bean>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.