[utilities COMMIT] in /xmlsectool/trunk: doc/RELEASE-NOTES.txt src/main/java/edu/internet2/middleware/security/XmlSec...

[noreply at shibboleth.net]

Author: iay
Date: Mon Mar 11 04:23:20 2013
New Revision: 346

URL: http://svn.shibboleth.net/view/utilities?rev=346&view=rev
Log:
[XSTJ-31] - add ECDSA elliptic curve signature support
Add explicit EC signing support, so that different --digest values can be used.

Modified:
    xmlsectool/trunk/doc/RELEASE-NOTES.txt
    xmlsectool/trunk/src/main/java/edu/internet2/middleware/security/XmlSecTool.java
    xmlsectool/trunk/src/main/java/edu/internet2/middleware/security/XmlSecToolCommandLineArguments.java

Modified: xmlsectool/trunk/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/utilities/xmlsectool/trunk/doc/RELEASE-NOTES.txt?rev=346&r1=345&r2=346&view=diff
==============================================================================
--- xmlsectool/trunk/doc/RELEASE-NOTES.txt (original)
+++ xmlsectool/trunk/doc/RELEASE-NOTES.txt Mon Mar 11 04:23:20 2013
@@ -1,5 +1,6 @@
 Changes in Release 1.2.0
 =============================================
+[XSTJ-31] - add ECDSA elliptic curve signature support
 [XSTJ-27] - compatibility with Apache Santuario 1.5.x
 [XSTJ-24] - should not use xmlsec IdResolver class
 [XSTJ-22] - non-zero exit codes from shell script

Modified: xmlsectool/trunk/src/main/java/edu/internet2/middleware/security/XmlSecTool.java
URL: http://svn.shibboleth.net/view/utilities/xmlsectool/trunk/src/main/java/edu/internet2/middleware/security/XmlSecTool.java?rev=346&r1=345&r2=346&view=diff
==============================================================================
--- xmlsectool/trunk/src/main/java/edu/internet2/middleware/security/XmlSecTool.java (original)
+++ xmlsectool/trunk/src/main/java/edu/internet2/middleware/security/XmlSecTool.java Mon Mar 11 04:23:20 2013
@@ -406,6 +406,8 @@
             log.debug("credential public key algorithm is {}", credentialAlgorithm);
             if ("RSA".equals(credentialAlgorithm)) {
                 signatureAlgorithm = cli.getDigest().getRsaAlgorithm();
+            } else if ("EC".equals(credentialAlgorithm)) {
+                signatureAlgorithm = cli.getDigest().getEcdsaAlgorithm();
             } else {
                 signatureAlgorithm = securityConfig.getSignatureAlgorithmURI(signingCredential);
             }

Modified: xmlsectool/trunk/src/main/java/edu/internet2/middleware/security/XmlSecToolCommandLineArguments.java
URL: http://svn.shibboleth.net/view/utilities/xmlsectool/trunk/src/main/java/edu/internet2/middleware/security/XmlSecToolCommandLineArguments.java?rev=346&r1=345&r2=346&view=diff
==============================================================================
--- xmlsectool/trunk/src/main/java/edu/internet2/middleware/security/XmlSecToolCommandLineArguments.java (original)
+++ xmlsectool/trunk/src/main/java/edu/internet2/middleware/security/XmlSecToolCommandLineArguments.java Mon Mar 11 04:23:20 2013
@@ -39,28 +39,32 @@
          */
         SHA1("SHA-1",
                 SignatureConstants.ALGO_ID_DIGEST_SHA1,
-                SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA1),
+                SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA1,
+                SignatureConstants.ALGO_ID_SIGNATURE_ECDSA_SHA1),
         
         /**
          * SHA-256 digest.
          */
         SHA256("SHA-256",
                 EncryptionConstants.ALGO_ID_DIGEST_SHA256,
-                SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA256),
+                SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA256,
+                SignatureConstants.ALGO_ID_SIGNATURE_ECDSA_SHA256),
         
         /**
          * SHA-384 digest.
          */
         SHA384("SHA-384",
                 SignatureConstants.ALGO_ID_DIGEST_SHA384,
-                SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA384),
+                SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA384,
+                SignatureConstants.ALGO_ID_SIGNATURE_ECDSA_SHA384),
         
         /**
          * SHA-512 digest.
          */
         SHA512("SHA-512",
                 EncryptionConstants.ALGO_ID_DIGEST_SHA512,
-                SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA512);
+                SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA512,
+                SignatureConstants.ALGO_ID_SIGNATURE_ECDSA_SHA512);
         
         /**
          * Other name (with hyphens, etc.) used as an alternative to the enum name.
@@ -76,6 +80,11 @@
          * RSA signature algorithm.
          */
         private final String rsaAlgorithm;
+        
+        /**
+         * ECDSA signature algorithm.
+         */
+        private final String ecdsaAlgorithm;
         
         /**
          * Constructor.
@@ -83,12 +92,14 @@
          * @param otherNameArg an alternative name for the enum.
          * @param digestArg digest algorithm URI
          * @param rsaArg RSA signature algorithm URI
+         * @param ecdsaArg ECDSA signature algorithm URI
          */
         private DigestChoice(final String otherNameArg,
-                final String digestArg, final String rsaArg) {
+                final String digestArg, final String rsaArg, final String ecdsaArg) {
             otherName = otherNameArg;

[... 32 lines stripped ...]