[java-opensaml COMMIT] in /trunk/opensaml-xmlsec-impl/src: main/java/org/opensaml/xmlsec/config/DefaultSecurityConfig...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Jan 29 23:31:54 2013
New Revision: 3175

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3175&view=rev
Log:
Port java-xmltooling r740, JXT-79

Modified:
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/config/DefaultSecurityConfigurationBootstrap.java
    trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/SimpleDecryptionTest.java
    trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/SimpleEncryptionTest.java

Modified: trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/config/DefaultSecurityConfigurationBootstrap.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/config/DefaultSecurityConfigurationBootstrap.java?rev=3175&r1=3174&r2=3175&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/config/DefaultSecurityConfigurationBootstrap.java (original)
+++ trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/config/DefaultSecurityConfigurationBootstrap.java Tue Jan 29 23:31:54 2013
@@ -101,7 +101,7 @@
         config.registerKeyTransportEncryptionAlgorithmURI(
                 "RSA", null, "AES", EncryptionConstants.ALGO_ID_KEYTRANSPORT_RSAOAEP);
         config.registerKeyTransportEncryptionAlgorithmURI(
-                "RSA", null, "DESede", EncryptionConstants.ALGO_ID_KEYTRANSPORT_RSA15);
+                "RSA", null, "DESede", EncryptionConstants.ALGO_ID_KEYTRANSPORT_RSAOAEP);
         
         // Symmetric key wrap algorithms
         config.registerKeyTransportEncryptionAlgorithmURI("AES", 128, null, EncryptionConstants.ALGO_ID_KEYWRAP_AES128);

Modified: trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/SimpleDecryptionTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/SimpleDecryptionTest.java?rev=3175&r1=3174&r2=3175&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/SimpleDecryptionTest.java (original)
+++ trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/SimpleDecryptionTest.java Tue Jan 29 23:31:54 2013
@@ -80,7 +80,7 @@
         super();
         
         encURI = EncryptionConstants.ALGO_ID_BLOCKCIPHER_AES128;
-        kekURI = EncryptionConstants.ALGO_ID_KEYTRANSPORT_RSA15;
+        kekURI = EncryptionConstants.ALGO_ID_KEYTRANSPORT_RSAOAEP;
         
         targetFile = "/data/org/opensaml/xmlsec/encryption/support/SimpleDecryptionTest.xml";
     }

Modified: trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/SimpleEncryptionTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/SimpleEncryptionTest.java?rev=3175&r1=3174&r2=3175&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/SimpleEncryptionTest.java (original)
+++ trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/SimpleEncryptionTest.java Tue Jan 29 23:31:54 2013
@@ -95,7 +95,7 @@
         targetFile = "/data/org/opensaml/xmlsec/encryption/support/SimpleEncryptionTest.xml";
         
         algoURI = EncryptionConstants.ALGO_ID_BLOCKCIPHER_AES128;
-        kekURIRSA = EncryptionConstants.ALGO_ID_KEYTRANSPORT_RSA15;
+        kekURIRSA = EncryptionConstants.ALGO_ID_KEYTRANSPORT_RSAOAEP;
         kekURIAES = EncryptionConstants.ALGO_ID_KEYWRAP_AES128;
     }