[java-opensaml COMMIT] in /trunk: opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/EncryptionConfiguration.java ...

[noreply at shibboleth.net]

Author: putmanb
Date: Mon Sep 22 20:16:13 2014
New Revision: 4043

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4043&view=rev
Log:
Add encryption config flag as to whether to merge RSAOAEPParameters.

Modified:
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/EncryptionConfiguration.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionConfiguration.java
    trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicEncryptionConfigurationTest.java

Modified: trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/EncryptionConfiguration.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/EncryptionConfiguration.java?rev=4043&r1=4042&r2=4043&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/EncryptionConfiguration.java (original)
+++ trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/EncryptionConfiguration.java Mon Sep 22 20:16:13 2014
@@ -86,6 +86,14 @@
     @Nullable public RSAOAEPParameters getRSAOAEPParameters();
     
     /**
+     * Flag indicating whether to merge this configuration's {@link RSAOAEPParameters} values with those of 
+     * a lower order of precedence, or to treat this configuration's parameters set as authoritative.
+     * 
+     * @return true if should merge, false otherwise
+     */
+    public boolean isRSAOAEPParametersMerge();
+    
+    /**
      * Get the instance of {@link KeyTransportAlgorithmPredicate}.
      * 
      * @return the predicate instance

Modified: trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionConfiguration.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionConfiguration.java?rev=4043&r1=4042&r2=4043&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionConfiguration.java (original)
+++ trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionConfiguration.java Mon Sep 22 20:16:13 2014
@@ -72,6 +72,9 @@
     /** RSA OAEP parameters. */
     @Nullable private RSAOAEPParameters rsaOAEPParameters;
     
+    /** Flag whether to merge RSA OAEP parameters. */
+    private boolean rsaOAEPParametersMerge;
+    
     /** Key transport algorithm predicate. */
     @Nullable private KeyTransportAlgorithmPredicate keyTransportPredicate;
     
@@ -86,6 +89,8 @@
         dataEncryptionAlgorithms = Collections.emptyList();
         keyTransportEncryptionCredentials = Collections.emptyList();
         keyTransportEncryptionAlgorithms = Collections.emptyList();
+        
+        rsaOAEPParametersMerge = true;
     }
     
     /** {@inheritDoc} */
@@ -209,6 +214,27 @@
         rsaOAEPParameters = params;
     }
     
+    /** {@inheritDoc}.
+     * 
+     * <p>Defaults to: <code>true</code>
+     * 
+     * */
+    public boolean isRSAOAEPParametersMerge() {
+        return rsaOAEPParametersMerge;
+    }
+    
+    /**
+     * Set the flag indicating whether to merge this configuration's {@link RSAOAEPParameters} values with those of 
+     * a lower order of precedence, or to treat this configuration's parameters set as authoritative.
+     * 
+     * <p>Defaults to: <code>true</code>
+     * 
+     * @param flag true if should merge, false otherwise
+     */
+    public void setRSAOAEPParametersMerge(boolean flag) {
+        rsaOAEPParametersMerge = flag;
+    }
+    
     /** {@inheritDoc} */
     @Override
     @Nullable public KeyTransportAlgorithmPredicate getKeyTransportAlgorithmPredicate() {

Modified: trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicEncryptionConfigurationTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicEncryptionConfigurationTest.java?rev=4043&r1=4042&r2=4043&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicEncryptionConfigurationTest.java (original)
+++ trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicEncryptionConfigurationTest.java Mon Sep 22 20:16:13 2014
@@ -216,6 +216,19 @@
     }
     
     @Test
+    public void testRSAOAEPParametersMerge() {
+        Assert.assertTrue(config.isRSAOAEPParametersMerge());
+        
+        config.setRSAOAEPParametersMerge(false);
+        
+        Assert.assertFalse(config.isRSAOAEPParametersMerge());
+        
+        config.setRSAOAEPParametersMerge(true);
+        
+        Assert.assertTrue(config.isRSAOAEPParametersMerge());
+    }
+    
+    @Test
     public void testKeyTransportAlgorithmPredicate() {
         Assert.assertNull(config.getKeyTransportAlgorithmPredicate());