[utilities COMMIT] /xmlsectool/trunk/src/main/java/edu/internet2/middleware/security/XmlSecToolCommandLineArguments.java

[noreply at shibboleth.net]

Author: iay
Date: Fri Mar  8 16:55:10 2013
New Revision: 343

URL: http://svn.shibboleth.net/view/utilities?rev=343&view=rev
Log:
[XSTJ-14] - allow specification of Digest and Signature algorithms when signing
Cont'd: use java-xmltooling to source digest and signature constants, not Santuario.

Modified:
    xmlsectool/trunk/src/main/java/edu/internet2/middleware/security/XmlSecToolCommandLineArguments.java

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=343&r1=342&r2=343&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 Fri Mar  8 16:55:10 2013
@@ -23,8 +23,8 @@
 import java.io.PrintStream;
 import java.util.List;
 
-import org.apache.xml.security.algorithms.MessageDigestAlgorithm;
-import org.apache.xml.security.signature.XMLSignature;
+import org.opensaml.xml.encryption.EncryptionConstants;
+import org.opensaml.xml.signature.SignatureConstants;
 
 /** Command line arguments for the {@link XmlSecTool} command line tool. */
 public class XmlSecToolCommandLineArguments {
@@ -38,29 +38,29 @@
          * SHA-1 digest.
          */
         SHA1("SHA-1",
-                MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA1,
-                XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA1),
+                SignatureConstants.ALGO_ID_DIGEST_SHA1,
+                SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA1),
         
         /**
          * SHA-256 digest.
          */
         SHA256("SHA-256",
-                MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA256,
-                XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA256),
+                EncryptionConstants.ALGO_ID_DIGEST_SHA256,
+                SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA256),
         
         /**
          * SHA-384 digest.
          */
         SHA384("SHA-384",
-                MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA384,
-                XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA384),
+                SignatureConstants.ALGO_ID_DIGEST_SHA384,
+                SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA384),
         
         /**
          * SHA-512 digest.
          */
         SHA512("SHA-512",
-                MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA512,
-                XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA512);
+                EncryptionConstants.ALGO_ID_DIGEST_SHA512,
+                SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA512);
         
         /**
          * Other name (with hyphens, etc.) used as an alternative to the enum name.