[java-opensaml COMMIT] /trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/Encrypter.java

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Sep 19 15:51:45 2014
New Revision: 4022

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4022&view=rev
Log:
Fix refactoring for removed method.

Modified:
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/Encrypter.java

Modified: trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/Encrypter.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/Encrypter.java?rev=4022&r1=4021&r2=4022&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/Encrypter.java (original)
+++ trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/Encrypter.java Fri Sep 19 15:51:45 2014
@@ -359,7 +359,7 @@
 
         org.apache.xml.security.encryption.EncryptedKey apacheEncryptedKey;
         try {
-            if (isRSAOAEP(encryptionAlgorithmURI) && rsaOAEPParams != null) {
+            if (AlgorithmSupport.isRSAOAEP(encryptionAlgorithmURI) && rsaOAEPParams != null) {
                 apacheEncryptedKey = xmlCipher.encryptKey(containingDocument, targetKey, 
                         getEffectiveMGF(encryptionAlgorithmURI, rsaOAEPParams), 
                         decodeOAEPParams(rsaOAEPParams.getOAEPParams()));
@@ -398,14 +398,16 @@
         XMLCipher xmlCipher;
         
         if (getJCAProviderName() != null) {
-            if (isRSAOAEP(encryptionAlgorithmURI) && rsaOAEPParams != null && rsaOAEPParams.getDigestMethod() != null) {
+            if (AlgorithmSupport.isRSAOAEP(encryptionAlgorithmURI) && rsaOAEPParams != null 
+                    && rsaOAEPParams.getDigestMethod() != null) {
                 xmlCipher = XMLCipher.getProviderInstance(encryptionAlgorithmURI, getJCAProviderName(), 
                         null, rsaOAEPParams.getDigestMethod());
             } else {
                 xmlCipher = XMLCipher.getProviderInstance(encryptionAlgorithmURI, getJCAProviderName());
             }
         } else {
-            if (isRSAOAEP(encryptionAlgorithmURI) && rsaOAEPParams != null && rsaOAEPParams.getDigestMethod() != null) {
+            if (AlgorithmSupport.isRSAOAEP(encryptionAlgorithmURI) && rsaOAEPParams != null 
+                    && rsaOAEPParams.getDigestMethod() != null) {
                 xmlCipher = XMLCipher.getInstance(encryptionAlgorithmURI, null, rsaOAEPParams.getDigestMethod());
             } else {
                 xmlCipher = XMLCipher.getInstance(encryptionAlgorithmURI);