[java-xmltooling COMMIT] in /branches/REL_1: doc/RELEASE-NOTES.txt src/main/java/org/opensaml/xml/security/BasicSecur...

[noreply at shibboleth.net]

Author: scantor
Date: Sun Mar 10 20:32:33 2013
New Revision: 798

URL: http://svn.shibboleth.net/view/java-xmltooling?rev=798&view=rev
Log:
JXT-101: wrong key algorithm used for elliptic curve keys

Modified:
    branches/REL_1/doc/RELEASE-NOTES.txt
    branches/REL_1/src/main/java/org/opensaml/xml/security/BasicSecurityConfiguration.java
    branches/REL_1/src/main/java/org/opensaml/xml/security/DefaultSecurityConfigurationBootstrap.java
    branches/REL_1/src/main/java/org/opensaml/xml/security/SecurityHelper.java
    branches/REL_1/src/test/java/org/opensaml/xml/security/SecurityHelperTest.java

Modified: branches/REL_1/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/java-xmltooling/branches/REL_1/doc/RELEASE-NOTES.txt?rev=798&r1=797&r2=798&view=diff
==============================================================================
--- branches/REL_1/doc/RELEASE-NOTES.txt (original)
+++ branches/REL_1/doc/RELEASE-NOTES.txt Sun Mar 10 20:32:33 2013
@@ -8,6 +8,7 @@
 [JXT-97] - DigestMethod builder defaults to wrong namespace/prefix
 [JXT-98] - Add support for configuring PKIX policy checking in the PKIX trust engine
 [JXT-99] - Signature verification exception on Java 7
+[JXT-101] - Wrong key algorithm used for elliptic curve keys
 
 Changes in Release 1.3.4
 =============================================

Modified: branches/REL_1/src/main/java/org/opensaml/xml/security/BasicSecurityConfiguration.java
URL: http://svn.shibboleth.net/view/java-xmltooling/branches/REL_1/src/main/java/org/opensaml/xml/security/BasicSecurityConfiguration.java?rev=798&r1=797&r2=798&view=diff
==============================================================================
--- branches/REL_1/src/main/java/org/opensaml/xml/security/BasicSecurityConfiguration.java (original)
+++ branches/REL_1/src/main/java/org/opensaml/xml/security/BasicSecurityConfiguration.java Sun Mar 10 20:32:33 2013
@@ -40,7 +40,7 @@
     /** Class logger. */
     private final Logger log = LoggerFactory.getLogger(BasicSecurityConfiguration.class);
     
-    /** JCA algorithm to signature URI mappings. */
+    /** JCA key algorithm to signature URI mappings. */
     private Map<String, String> signatureAlgorithms;
     
     /** Signature canonicalization algorithm URI. */
@@ -52,10 +52,10 @@
     /** Signature HMAC output length. */
     private Integer signatureHMACOutputLength;
     
-    /** JCA algorithm to data encryption URI mappings. */
+    /** JCA key algorithm to data encryption URI mappings. */
     private Map<DataEncryptionIndex, String> dataEncryptionAlgorithms;
     
-    /** JCA algorithm to key transport encryption URI mappings. */
+    /** JCA key algorithm to key transport encryption URI mappings. */
     private Map<KeyTransportEncryptionIndex, String> keyTransportEncryptionAlgorithms;
     
     /** Encryption algorithm URI for auto-generated data encryption keys. */
@@ -100,9 +100,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(String jcaAlgorithmName, String algorithmURI) {
@@ -110,9 +110,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(String jcaAlgorithmName) {
         signatureAlgorithms.remove(jcaAlgorithmName);

Modified: branches/REL_1/src/main/java/org/opensaml/xml/security/DefaultSecurityConfigurationBootstrap.java
URL: http://svn.shibboleth.net/view/java-xmltooling/branches/REL_1/src/main/java/org/opensaml/xml/security/DefaultSecurityConfigurationBootstrap.java?rev=798&r1=797&r2=798&view=diff
==============================================================================
--- branches/REL_1/src/main/java/org/opensaml/xml/security/DefaultSecurityConfigurationBootstrap.java (original)
+++ branches/REL_1/src/main/java/org/opensaml/xml/security/DefaultSecurityConfigurationBootstrap.java Sun Mar 10 20:32:33 2013
@@ -67,7 +67,7 @@
         // Asymmetric key algorithms
         config.registerSignatureAlgorithmURI("RSA", SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA1);
         config.registerSignatureAlgorithmURI("DSA", SignatureConstants.ALGO_ID_SIGNATURE_DSA);
-        config.registerSignatureAlgorithmURI("ECDSA", SignatureConstants.ALGO_ID_SIGNATURE_ECDSA_SHA1);
+        config.registerSignatureAlgorithmURI("EC", SignatureConstants.ALGO_ID_SIGNATURE_ECDSA_SHA1);
         
         // HMAC algorithms

[... 32 lines stripped ...]