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

[noreply at shibboleth.net]

Author: scantor
Date: Sun Mar 10 20:49:37 2013
New Revision: 3266

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3266&view=rev
Log:
Port java-xmltooling r798.

Modified:
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/crypto/AlgorithmSupport.java
    trunk/opensaml-xmlsec-api/src/test/java/org/opensaml/xmlsec/crypto/AlgorithmSupportTest.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/config/BasicSecurityConfiguration.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/config/DefaultSecurityConfigurationBootstrap.java

Modified: trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/crypto/AlgorithmSupport.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/crypto/AlgorithmSupport.java?rev=3266&r1=3265&r2=3266&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/crypto/AlgorithmSupport.java (original)
+++ trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/crypto/AlgorithmSupport.java Sun Mar 10 20:49:37 2013
@@ -109,7 +109,7 @@
         } else if (dsaAlgorithmURIs.contains(algorithmURI)) {
             return "DSA";
         } else if (ecdsaAlgorithmURIs.contains(algorithmURI)) {
-            return "ECDSA";
+            return "EC";
         }
     
         return null;

Modified: trunk/opensaml-xmlsec-api/src/test/java/org/opensaml/xmlsec/crypto/AlgorithmSupportTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-api/src/test/java/org/opensaml/xmlsec/crypto/AlgorithmSupportTest.java?rev=3266&r1=3265&r2=3266&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-api/src/test/java/org/opensaml/xmlsec/crypto/AlgorithmSupportTest.java (original)
+++ trunk/opensaml-xmlsec-api/src/test/java/org/opensaml/xmlsec/crypto/AlgorithmSupportTest.java Sun Mar 10 20:49:37 2013
@@ -55,7 +55,7 @@
         Assert.assertEquals(AlgorithmSupport.getKeyAlgorithm(SignatureConstants.ALGO_ID_SIGNATURE_NOT_RECOMMENDED_RSA_MD5), "RSA");
         Assert.assertEquals(AlgorithmSupport.getKeyAlgorithm(SignatureConstants.ALGO_ID_SIGNATURE_RSA_RIPEMD160), "RSA");
         Assert.assertEquals(AlgorithmSupport.getKeyAlgorithm(SignatureConstants.ALGO_ID_SIGNATURE_DSA), "DSA");
-        Assert.assertEquals(AlgorithmSupport.getKeyAlgorithm(SignatureConstants.ALGO_ID_SIGNATURE_ECDSA_SHA1), "ECDSA");
+        Assert.assertEquals(AlgorithmSupport.getKeyAlgorithm(SignatureConstants.ALGO_ID_SIGNATURE_ECDSA_SHA1), "EC");
         
         // Mac related.  No specific key algorithm is indicated, any symmetric key will do. Should always return null;
         Assert.assertNull(AlgorithmSupport.getKeyAlgorithm(SignatureConstants.ALGO_ID_MAC_HMAC_SHA1));

Modified: trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/config/BasicSecurityConfiguration.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/config/BasicSecurityConfiguration.java?rev=3266&r1=3265&r2=3266&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/config/BasicSecurityConfiguration.java (original)
+++ trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/config/BasicSecurityConfiguration.java Sun Mar 10 20:49:37 2013
@@ -109,9 +109,9 @@
     }
     
     /**
-     * Register a mapping from the specified JCA algorithm name to a signature algorithm URI.
-     * 
-     * @param jcaAlgorithmName the JCA algorithm name to register
+     * Register a mapping from the specified JCA key algorithm name to a signature algorithm URI.
+     * 
+     * @param jcaAlgorithmName the JCA key algorithm name to register
      * @param algorithmURI the algorithm URI to register
      */
     public void registerSignatureAlgorithmURI(@Nonnull final String jcaAlgorithmName,
@@ -120,9 +120,9 @@
     }
     
     /**
-     * Deregister a mapping for the specified JCA algorithm name.
-     * 
-     * @param jcaAlgorithmName the JCA algorithm name to deregister
+     * Deregister a mapping for the specified JCA key algorithm name.
+     * 
+     * @param jcaAlgorithmName the JCA key algorithm name to deregister
      */
     public void deregisterSignatureAlgorithmURI(@Nonnull final String jcaAlgorithmName) {
         signatureAlgorithms.remove(jcaAlgorithmName);
@@ -206,9 +206,9 @@
     }
     
     /**
-     * Register a mapping from the specified JCA algorithm name to an encryption algorithm URI.
-     * 
-     * @param jcaAlgorithmName the JCA algorithm name to register
+     * Register a mapping from the specified JCA key algorithm name to an encryption algorithm URI.
+     * 
+     * @param jcaAlgorithmName the JCA key algorithm name to register
      * @param keyLength the key length to register (may be null)
      * @param algorithmURI the algorithm URI to register
      */
@@ -219,7 +219,7 @@
     }
     
     /**

[... 39 lines stripped ...]