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

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Aug 22 17:16:14 2014
New Revision: 4011

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4011&view=rev
Log:
Add new RSAOAEPParameters class to represent RSA-OAEP algorithm params.
Add params instance API slot in various relevant places.

Added:
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/RSAOAEPParameters.java   (with props)
    trunk/opensaml-xmlsec-api/src/test/java/org/opensaml/xmlsec/encryption/
    trunk/opensaml-xmlsec-api/src/test/java/org/opensaml/xmlsec/encryption/support/
    trunk/opensaml-xmlsec-api/src/test/java/org/opensaml/xmlsec/encryption/support/RSAOAEPParametersTest.java   (with props)
Modified:
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/EncryptionConfiguration.java
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/EncryptionParameters.java
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/KeyEncryptionParameters.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=4011&r1=4010&r2=4011&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 Fri Aug 22 17:16:14 2014
@@ -27,6 +27,7 @@
 import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
 
 import org.opensaml.security.credential.Credential;
+import org.opensaml.xmlsec.encryption.support.RSAOAEPParameters;
 import org.opensaml.xmlsec.keyinfo.NamedKeyInfoGeneratorManager;
 
 
@@ -77,4 +78,11 @@
      */
     @Nullable public NamedKeyInfoGeneratorManager getKeyTransportKeyInfoGeneratorManager();
     
+    /**
+     * Get the instance of {@link RSAOAEPParameters}.
+     * 
+     * @return the parameters instance
+     */
+    @Nullable public RSAOAEPParameters getRSAOAEPParameters();
+    
 }

Modified: trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/EncryptionParameters.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/EncryptionParameters.java?rev=4011&r1=4010&r2=4011&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/EncryptionParameters.java (original)
+++ trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/EncryptionParameters.java Fri Aug 22 17:16:14 2014
@@ -20,6 +20,7 @@
 import javax.annotation.Nullable;
 
 import org.opensaml.security.credential.Credential;
+import org.opensaml.xmlsec.encryption.support.RSAOAEPParameters;
 import org.opensaml.xmlsec.keyinfo.KeyInfoGenerator;
 
 
@@ -45,6 +46,10 @@
     
     /** The EncryptedKey KeyInfoGenerator. */
     private KeyInfoGenerator keyTransportKeyInfoGenerator;
+    
+    /** RSA OAEP parameters. */
+    private RSAOAEPParameters rsaOAEPParameters;
+
     
     /**
      * Get the encryption credential to use when encrypting the EncryptedData.
@@ -154,4 +159,22 @@
         keyTransportKeyInfoGenerator = generator;
     }
     
+    /**
+     * Get the instance of {@link RSAOAEPParameters}.
+     * 
+     * @return the parameters instance
+     */
+    @Nullable public RSAOAEPParameters getRSAOAEPParameters() {
+        return rsaOAEPParameters;
+    }
+
+    /**
+     * Set the instance of {@link RSAOAEPParameters}.
+     * 
+     * @param params the new parameters instance
+     */
+    public void setRSAOAEPParameters(@Nullable final RSAOAEPParameters params) {
+        rsaOAEPParameters = params;
+    }
+    
 }

Modified: trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/KeyEncryptionParameters.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/KeyEncryptionParameters.java?rev=4011&r1=4010&r2=4011&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/KeyEncryptionParameters.java (original)
+++ trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/KeyEncryptionParameters.java Fri Aug 22 17:16:14 2014
@@ -31,6 +31,9 @@
 
     /** Recipient of the key. */
     private String recipient;
+    
+    /** RSA OAEP parameters. */
+    private RSAOAEPParameters rsaOAEPParameters;
 
     /**
      * Constructor.
@@ -57,6 +60,7 @@
         setAlgorithm(params.getKeyTransportEncryptionAlgorithm());
         setKeyInfoGenerator(params.getKeyTransportKeyInfoGenerator());

[... 119 lines stripped ...]