You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by co...@apache.org on 2011/01/26 17:00:43 UTC
svn commit: r1063768 [1/3] - in /santuario/xml-security-java/trunk: ./ data/
samples/data/ samples/data/at/ samples/data/at/iaik/
samples/data/at/iaik/ixsil/ samples/data/com/ samples/data/com/pothole/
samples/data/com/pureedge/ samples/data/ie/ sample...
Author: coheigea
Date: Wed Jan 26 16:00:40 2011
New Revision: 1063768
URL: http://svn.apache.org/viewvc?rev=1063768&view=rev
Log:
[SANTUARIO-257] - Moved data -> src/test/resources, and copied the samples data -> samples/data
Added:
santuario/xml-security-java/trunk/samples/data/
santuario/xml-security-java/trunk/samples/data/at/
santuario/xml-security-java/trunk/samples/data/at/iaik/
santuario/xml-security-java/trunk/samples/data/at/iaik/ixsil/
- copied from r1063628, santuario/xml-security-java/trunk/data/at/iaik/ixsil/
santuario/xml-security-java/trunk/samples/data/com/
santuario/xml-security-java/trunk/samples/data/com/pothole/
- copied from r1063628, santuario/xml-security-java/trunk/data/com/pothole/
santuario/xml-security-java/trunk/samples/data/com/pureedge/
- copied from r1063628, santuario/xml-security-java/trunk/data/com/pureedge/
santuario/xml-security-java/trunk/samples/data/ie/
- copied from r1063628, santuario/xml-security-java/trunk/data/ie/
santuario/xml-security-java/trunk/samples/data/keystore.jks
- copied unchanged from r1063628, santuario/xml-security-java/trunk/data/org/apache/xml/security/samples/input/keystore.jks
santuario/xml-security-java/trunk/samples/data/org/
santuario/xml-security-java/trunk/samples/data/org/apache/
santuario/xml-security-java/trunk/samples/data/org/apache/xml/
santuario/xml-security-java/trunk/samples/data/org/apache/xml/security/
santuario/xml-security-java/trunk/samples/data/org/apache/xml/security/temp/
- copied from r1063628, santuario/xml-security-java/trunk/data/org/apache/xml/security/temp/
santuario/xml-security-java/trunk/samples/data/org/w3c/
- copied from r1063628, santuario/xml-security-java/trunk/data/org/w3c/
santuario/xml-security-java/trunk/samples/data/xmldsig-core-schema.xsd
- copied unchanged from r1063628, santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/resource/schema/xmldsig-core-schema.xsd
santuario/xml-security-java/trunk/src/test/resources/
- copied from r1063628, santuario/xml-security-java/trunk/data/
Removed:
santuario/xml-security-java/trunk/data/
santuario/xml-security-java/trunk/src/test/resources/com/pureedge/
Modified:
santuario/xml-security-java/trunk/build.xml
santuario/xml-security-java/trunk/pom.xml
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/AxisSigner.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/TransformPerformanceTester.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/algorithms/HMacSHA1RoundTrip.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/iaik/IAIKInterOp.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/keys/CreateKeyInfo.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/keys/RetrievePublicKeys.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateCollectableSignature.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateDonaldsAdditionalURISignature.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateEnvelopingSignature.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateMerlinsExampleSixteen.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateMerlinsExampleTwentyThree.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateNullURIReference.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateSignature.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/TestSignature.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesFifteen.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesSixteen.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesTwentyThree.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifySignature.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/utils/resolver/OfflineResolver.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/Baltimore18Test.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/Baltimore23Test.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/BaltimoreExcC14n1Test.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/BaltimoreIaik2Test.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/BaltimoreXPathFilter2ThreeTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/C14N11Test.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ComRSASecurityTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateBaltimore23Test.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropExcC14NTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropXFilter2Test.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/IaikCoreFeaturesTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/IaikSignatureAlgosTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/IaikTransformsTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/InteropC14nTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/InteropXMLDSig11Test.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/LocalHttpCacheURIDereferencer.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/PhaosXMLDSig3Test.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SecureXSLTTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ValidateSignatureTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureFactoryTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/dom/DOMValidateContextTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/DSNamespaceContext.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/c14n/implementations/Bug45961Test.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/c14n/implementations/Canonicalizer20010315ExclusiveTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/c14n/implementations/Canonicalizer20010315Test.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/c14n/implementations/ExclusiveC14NInteropTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/encryption/BaltimoreEncTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/interop/BaltimoreTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/interop/IAIKTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/interop/IBMTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/interop/RSASecurityTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/keys/content/x509/XMLX509CertificateTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/keys/content/x509/XMLX509SKITest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/keys/storage/KeyStoreResolverTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/keys/storage/StorageResolverTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/signature/CreateSignatureTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/signature/ECDSASignatureTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/signature/HMACOutputLengthTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/signature/InvalidKeyTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/signature/KeyValueTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/signature/NoKeyInfoTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/signature/ProcessingInstructionTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/signature/SignatureTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/signature/UnknownAlgoSignatureTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/signature/X509DataTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/signature/XmlSecTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/transforms/implementations/TransformXSLTTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/utils/resolver/OfflineResolver.java
Modified: santuario/xml-security-java/trunk/build.xml
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/build.xml?rev=1063768&r1=1063767&r2=1063768&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/build.xml (original)
+++ santuario/xml-security-java/trunk/build.xml Wed Jan 26 16:00:40 2011
@@ -25,8 +25,6 @@
<property name="dir.src.test" value="${basedir}/src/test/java" />
<property name="dir.src.samples" value="${basedir}/samples" />
<property name="dir.libs" value="${basedir}/libs" />
- <property name="dir.data" value="${basedir}/data" />
- <property name="dir.docs" value="${basedir}/doc/site" />
<property name="dir.build" value="${basedir}/build" />
<property name="dir.build.bin" value="${dir.build}/classes" />
<property name="dir.build.libs" value="${dir.build}/libs" />
@@ -71,20 +69,14 @@
<!-- build variable properties -->
-
<!-- T A S K D E F S -->
<taskdef resource="clovertasks"/>
-
-
<!-- C O N D I T I O N A L P R O P E R T I E S -->
<target name="do.build.src" >
<!-- global properties applies here -->
</target >
-
-
-
<!-- P A T H S -->
<path id="id.classpath.xalan" >
<pathelement location="${lib.xalan.1}" />
@@ -137,7 +129,6 @@
<pathelement location="${lib.xmlsec.tests}" />
</path>
-
<!-- P A T T E R N S E T S -->
<patternset id="id.patternset.distFiles">
<include name="build.xml"/>
@@ -149,12 +140,6 @@
<include name="TODO"/>
</patternset>
- <patternset id="id.patternset.dataFiles">
- <include name="data/**"/>
- <exclude name="data/de/uni-siegen/**"/>
- <exclude name="data/com/ibm/xss4j-20030127/**/*"/>
- </patternset>
-
<patternset id="id.patternset.srcFiles">
<include name="src/**/*"/>
</patternset>
@@ -301,10 +286,13 @@
includeAntRuntime="false">
<classpath refid="id.classpath.samples"/>
</javac>
+ <copy todir="${dir.build.samples}/data">
+ <fileset dir="${dir.src.samples}/data" includes="**/*.xml"/>
+ <fileset dir="${dir.src.samples}/data" includes="**/*.zip"/>
+ </copy>
</target>
-
<!-- T E S T T A R G E T S -->
<!-- big test -->
<target name="test" depends="build.jar"
@@ -324,12 +312,12 @@
and put the files into the
- data/com/ibm/xss4j-20030127/
+ src/test/resources/com/ibm/xss4j-20030127/
directory. If the file enveloped-rsa.sig is found in that directory,
IBM is 'magically' included in the test ;-))
-->
- <available file="data/com/ibm/xss4j-20030127/enveloped-rsa.sig" property="ibm.available"/>
+ <available file="src/test/resources/com/ibm/xss4j-20030127/enveloped-rsa.sig" property="ibm.available"/>
<copy file="${lib.xalan.1}" todir="${dir.build.libs2}"/>
<copy file="${lib.xalan.2}" todir="${dir.build.libs2}"/>
<copy file="${lib.xalan.3}" todir="${dir.build.libs2}"/>
@@ -608,7 +596,6 @@
<fileset dir=".">
<patternset refid="id.patternset.distFiles"/>
<patternset refid="id.patternset.srcFiles"/>
- <patternset refid="id.patternset.dataFiles"/>
<include name="ant/**/*"/>
</fileset>
@@ -622,7 +609,7 @@
</target>
<target name="build.bindist"
- depends="clean,build.src,build.jar,build.docs,build.xdocs"
+ depends="clean,build.src,build.jar,build.docs"
description="Creates the binary distribution">
<mkdir dir="${dir.build.bindist}"/>
@@ -630,7 +617,6 @@
<copy todir="${dir.build.bindist}">
<fileset dir=".">
<patternset refid="id.patternset.distFiles"/>
- <patternset refid="id.patternset.dataFiles"/>
<include name="ant/**/*"/>
</fileset>
@@ -660,9 +646,6 @@
todir="${dir.build.bindist}/libs"/>
<mkdir dir="${dir.build.bindist}/doc"/>
- <copy todir="${dir.build.bindist}/doc">
- <fileset dir="${dir.docs}/build/site"/>
- </copy>
<mkdir dir="${dir.build.bindist}/doc/Java/api" />
<copy todir="${dir.build.bindist}/doc/Java/api">
<fileset dir="${dir.build.docs.html}/javadoc"/>
@@ -800,7 +783,6 @@
<echo message="targets:" />
<echo message="compile - builds xml-security source" />
<echo message="docs - creates java documentation" />
- <echo message="xdocs - creates website" />
<echo message="jar - creates a jar file, containing the built source" />
<echo message="dist - creates a distribution" />
<echo message=" (see ant help.dist for more information)" />
@@ -851,20 +833,3 @@
</target>
</project>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:4
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:("/usr/lib/sgml/catalog" "/usr/share/xemacs21/xemacs-packages/etc/psgml-dtds/CATALOG")
-sgml-local-ecat-files:("ECAT" "~/sgml/ECAT" "/usr/lib/sgml/ECAT" "/usr/local/lib/sgml/ECAT")
-End:
--->
Modified: santuario/xml-security-java/trunk/pom.xml
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/pom.xml?rev=1063768&r1=1063767&r2=1063768&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/pom.xml (original)
+++ santuario/xml-security-java/trunk/pom.xml Wed Jan 26 16:00:40 2011
@@ -90,6 +90,12 @@
<exclude>**/*.java</exclude>
</excludes>
</testResource>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </testResource>
</testResources>
<plugins>
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/AxisSigner.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/AxisSigner.java?rev=1063768&r1=1063767&r2=1063768&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/AxisSigner.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/AxisSigner.java Wed Jan 26 16:00:40 2011
@@ -48,7 +48,7 @@ public class AxisSigner {
org.apache.xml.security.Init.init();
String keystoreType = "JKS";
- String keystoreFile = "data/org/apache/xml/security/samples/input/keystore.jks";
+ String keystoreFile = "samples/data/keystore.jks";
String keystorePass = "xmlsecurity";
String privateKeyAlias = "test";
String privateKeyPass = "xmlsecurity";
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/TransformPerformanceTester.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/TransformPerformanceTester.java?rev=1063768&r1=1063767&r2=1063768&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/TransformPerformanceTester.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/TransformPerformanceTester.java Wed Jan 26 16:00:40 2011
@@ -165,7 +165,7 @@ public class TransformPerformanceTester
if (pureedge_xfilter2) {
Document doc =
- db.parse(new FileInputStream("data/com/pureedge/LeaveRequest.xfd"));
+ db.parse(new FileInputStream("samples/data/com/pureedge/LeaveRequest.xfd"));
long start = System.currentTimeMillis();
byte[][] result = null;
@@ -202,7 +202,7 @@ public class TransformPerformanceTester
if (pureedge_xfilter2_new) {
Document doc =
- db.parse(new FileInputStream("data/com/pureedge/LeaveRequest.xfd"));
+ db.parse(new FileInputStream("samples/data/com/pureedge/LeaveRequest.xfd"));
long start = System.currentTimeMillis();
byte[][] result = null;
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/algorithms/HMacSHA1RoundTrip.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/algorithms/HMacSHA1RoundTrip.java?rev=1063768&r1=1063767&r2=1063768&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/algorithms/HMacSHA1RoundTrip.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/algorithms/HMacSHA1RoundTrip.java Wed Jan 26 16:00:40 2011
@@ -51,7 +51,7 @@ public class HMacSHA1RoundTrip {
*/
public static void main(String unused[]) throws Exception {
String keystoreType = "JKS";
- String keystoreFile = "data/org/apache/xml/security/samples/input/keystore.jks";
+ String keystoreFile = "samples/data/keystore.jks";
String keystorePass = "xmlsecurity";
String privateKeyAlias = "test";
String privateKeyPass = "xmlsecurity";
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/iaik/IAIKInterOp.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/iaik/IAIKInterOp.java?rev=1063768&r1=1063767&r2=1063768&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/iaik/IAIKInterOp.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/iaik/IAIKInterOp.java Wed Jan 26 16:00:40 2011
@@ -48,7 +48,7 @@ public class IAIKInterOp {
static final boolean schemaValidate = false;
/** Field signatureSchemaFile */
- static final String signatureSchemaFile = "data/xmldsig-core-schema.xsd";
+ static final String signatureSchemaFile = "samples/data/xmldsig-core-schema.xsd";
static {
org.apache.xml.security.Init.init();
@@ -82,7 +82,7 @@ public class IAIKInterOp {
dbf.setNamespaceAware(true);
dbf.setAttribute("http://xml.org/sax/features/namespaces", Boolean.TRUE);
- String gregorsDir = "data/at/iaik/ixsil/";
+ String gregorsDir = "samples/data/at/iaik/ixsil/";
String filenames[] = {
gregorsDir + "signatureAlgorithms/signatures/hMACSignature.xml"
,gregorsDir + "signatureAlgorithms/signatures/hMACShortSignature.xml"
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/keys/CreateKeyInfo.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/keys/CreateKeyInfo.java?rev=1063768&r1=1063767&r2=1063768&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/keys/CreateKeyInfo.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/keys/CreateKeyInfo.java Wed Jan 26 16:00:40 2011
@@ -44,7 +44,7 @@ public class CreateKeyInfo {
KeyStore ks = KeyStore.getInstance("JKS");
FileInputStream fis = new FileInputStream(
- "data/org/apache/xml/security/samples/input/keystore.jks");
+ "samples/data/keystore.jks");
ks.load(fis, "xmlsecurity".toCharArray());
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/keys/RetrievePublicKeys.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/keys/RetrievePublicKeys.java?rev=1063768&r1=1063767&r2=1063768&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/keys/RetrievePublicKeys.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/keys/RetrievePublicKeys.java Wed Jan 26 16:00:40 2011
@@ -51,9 +51,9 @@ public class RetrievePublicKeys {
dbf.setNamespaceAware(true);
String merlinsDir =
- "data/ie/baltimore/merlin-examples/merlin-xmldsig-eighteen/";
+ "samples/data/ie/baltimore/merlin-examples/merlin-xmldsig-eighteen/";
String ourDir =
- "data/org/apache/xml/security/temp/key/";
+ "samples/data/org/apache/xml/security/temp/key/";
String filenames[] = { merlinsDir +
/* 0 */ "signature-keyname.xml",
merlinsDir +
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateCollectableSignature.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateCollectableSignature.java?rev=1063768&r1=1063767&r2=1063768&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateCollectableSignature.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateCollectableSignature.java Wed Jan 26 16:00:40 2011
@@ -16,8 +16,6 @@
*/
package org.apache.xml.security.samples.signature;
-
-
import java.io.File;
import java.io.FileOutputStream;
@@ -30,7 +28,6 @@ import org.apache.xml.security.utils.Con
import org.apache.xml.security.utils.XMLUtils;
import org.w3c.dom.Element;
-
/**
* These ones can be used to create Signatures which can be collected
* using your text editors cut-and-paste feature to create a file wich
@@ -45,120 +42,108 @@ public class CreateCollectableSignature
/** {@link org.apache.commons.logging} logging facility */
static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(
- CreateCollectableSignature.class.getName());
-
- /** Field passphrase */
- public static final String passphrase =
- "The super-mega-secret public static passphrase";
-
- /**
- * Method main
- *
- * @param unused
- * @throws Exception
- */
- public static void main(String unused[]) throws Exception {
- //J-
- File signatureFile = new File("collectableSignature.xml");
- String BaseURI = signatureFile.toURL().toString();
- //J+
- javax.xml.parsers.DocumentBuilderFactory dbf =
- javax.xml.parsers.DocumentBuilderFactory.newInstance();
-
- dbf.setNamespaceAware(true);
-
- javax.xml.parsers.DocumentBuilder db = dbf.newDocumentBuilder();
- org.w3c.dom.Document doc = db.newDocument();
- Element rootElement = doc.createElementNS(null, "root");
-
- doc.appendChild(rootElement);
-
- /*
- Element signedResourceElement = doc.createElementNS("http://custom/", "custom:signedContent");
- signedResourceElement.setAttributeNS(Constants.NamespaceNS, "xmlns:custom", "http://custom/");
- signedResourceElement.setAttributeNS(null, "Id", "id0");
- */
- Element signedResourceElement = doc.createElementNS(null, "signedContent");
-
- signedResourceElement.appendChild(doc.createTextNode("Signed Text\n"));
- rootElement.appendChild(signedResourceElement);
-
- XMLSignature sig = new XMLSignature(doc, BaseURI,
- XMLSignature.ALGO_ID_MAC_HMAC_SHA1);
-
- signedResourceElement.appendChild(sig.getElement());
-
- {
- String rootnamespace = signedResourceElement.getNamespaceURI();
- boolean rootprefixed = (rootnamespace != null)
- && (rootnamespace.length() > 0);
- String rootlocalname = signedResourceElement.getNodeName();
- Transforms transforms = new Transforms(doc);
- XPathContainer xpath = new XPathContainer(doc);
-
- xpath.setXPathNamespaceContext("ds", Constants.SignatureSpecNS);
-
- if (rootprefixed) {
- xpath.setXPathNamespaceContext("root", rootnamespace);
- }
-
- //J-
- String xpathStr = "\n"
- + "count( " + "\n"
- + " ancestor-or-self::" + (rootprefixed ? "root:" : "") + rootlocalname + "" + "\n"
- + " | " + "\n"
- + " here()/ancestor::" + (rootprefixed ? "root:" : "") + rootlocalname + "[1] " + "\n"
- + ") <= count( " + "\n"
- + " ancestor-or-self::" + (rootprefixed ? "root:" : "") + rootlocalname + "" + "\n"
- + ") " + "\n"
- + " and " + "\n"
- + "count( " + "\n"
- + " ancestor-or-self::ds:Signature " + "\n"
- + " | " + "\n"
- + " here()/ancestor::ds:Signature[1] " + "\n"
- + ") > count( " + "\n"
- + " ancestor-or-self::ds:Signature " + "\n"
- + ") " + "\n"
-
-
-
- ;
- //J+
- xpath.setXPath(xpathStr);
- transforms.addTransform(Transforms.TRANSFORM_XPATH,
- xpath.getElementPlusReturns());
- sig.addDocument("", transforms, Constants.ALGO_ID_DIGEST_SHA1);
- }
-
- {
- sig.getKeyInfo()
- .add(new KeyName(doc, CreateCollectableSignature.passphrase));
- System.out.println("Start signing");
- sig.sign(sig
- .createSecretKey(CreateCollectableSignature.passphrase.getBytes()));
- System.out.println("Finished signing");
- }
-
- FileOutputStream f = new FileOutputStream(signatureFile);
-
- XMLUtils.outputDOMc14nWithComments(doc, f);
- f.close();
- System.out.println("Wrote signature to " + BaseURI);
-
- SignedInfo s = sig.getSignedInfo();
-
- for (int i = 0; i < s.getSignedContentLength(); i++) {
- System.out.println("################ Signed Resource " + i
- + " ################");
- System.out.println(new String(s.getSignedContentItem(i)));
- System.out.println();
- }
- }
+ org.apache.commons.logging.LogFactory.getLog(CreateCollectableSignature.class.getName());
- static {
- org.apache.xml.security.Init.init();
+ /** Field passphrase */
+ public static final String passphrase =
+ "The super-mega-secret public static passphrase";
+
+ static {
+ org.apache.xml.security.Init.init();
+
+ // org.apache.xml.security.utils.Constants.setSignatureSpecNSprefix("");
+ }
+
+ /**
+ * Method main
+ *
+ * @param unused
+ * @throws Exception
+ */
+ public static void main(String unused[]) throws Exception {
+ File signatureFile = new File("collectableSignature.xml");
+ String BaseURI = signatureFile.toURI().toURL().toString();
+ javax.xml.parsers.DocumentBuilderFactory dbf =
+ javax.xml.parsers.DocumentBuilderFactory.newInstance();
+
+ dbf.setNamespaceAware(true);
+
+ javax.xml.parsers.DocumentBuilder db = dbf.newDocumentBuilder();
+ org.w3c.dom.Document doc = db.newDocument();
+ Element rootElement = doc.createElementNS(null, "root");
+
+ doc.appendChild(rootElement);
+
+ Element signedResourceElement = doc.createElementNS(null, "signedContent");
+
+ signedResourceElement.appendChild(doc.createTextNode("Signed Text\n"));
+ rootElement.appendChild(signedResourceElement);
+
+ XMLSignature sig =
+ new XMLSignature(doc, BaseURI, XMLSignature.ALGO_ID_MAC_HMAC_SHA1);
+
+ signedResourceElement.appendChild(sig.getElement());
+
+ {
+ String rootnamespace = signedResourceElement.getNamespaceURI();
+ boolean rootprefixed = (rootnamespace != null) && (rootnamespace.length() > 0);
+ String rootlocalname = signedResourceElement.getNodeName();
+ Transforms transforms = new Transforms(doc);
+ XPathContainer xpath = new XPathContainer(doc);
+
+ xpath.setXPathNamespaceContext("ds", Constants.SignatureSpecNS);
+
+ if (rootprefixed) {
+ xpath.setXPathNamespaceContext("root", rootnamespace);
+ }
+
+ String xpathStr = "\n"
+ + "count( " + "\n"
+ + " ancestor-or-self::" + (rootprefixed ? "root:" : "") + rootlocalname + "" + "\n"
+ + " | " + "\n"
+ + " here()/ancestor::" + (rootprefixed ? "root:" : "") + rootlocalname + "[1] " + "\n"
+ + ") <= count( " + "\n"
+ + " ancestor-or-self::" + (rootprefixed ? "root:" : "") + rootlocalname + "" + "\n"
+ + ") " + "\n"
+ + " and " + "\n"
+ + "count( " + "\n"
+ + " ancestor-or-self::ds:Signature " + "\n"
+ + " | " + "\n"
+ + " here()/ancestor::ds:Signature[1] " + "\n"
+ + ") > count( " + "\n"
+ + " ancestor-or-self::ds:Signature " + "\n"
+ + ") " + "\n"
+
+
+
+ ;
+ xpath.setXPath(xpathStr);
+ transforms.addTransform(Transforms.TRANSFORM_XPATH,
+ xpath.getElementPlusReturns());
+ sig.addDocument("", transforms, Constants.ALGO_ID_DIGEST_SHA1);
+ }
+
+ {
+ sig.getKeyInfo().add(new KeyName(doc, CreateCollectableSignature.passphrase));
+ System.out.println("Start signing");
+ sig.sign(sig.createSecretKey(CreateCollectableSignature.passphrase.getBytes()));
+ System.out.println("Finished signing");
+ }
+
+ FileOutputStream f = new FileOutputStream(signatureFile);
+
+ XMLUtils.outputDOMc14nWithComments(doc, f);
+ f.close();
+ System.out.println("Wrote signature to " + BaseURI);
+
+ SignedInfo s = sig.getSignedInfo();
+
+ for (int i = 0; i < s.getSignedContentLength(); i++) {
+ System.out.println("################ Signed Resource " + i
+ + " ################");
+ System.out.println(new String(s.getSignedContentItem(i)));
+ System.out.println();
+ }
+ }
- // org.apache.xml.security.utils.Constants.setSignatureSpecNSprefix("");
- }
}
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateDonaldsAdditionalURISignature.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateDonaldsAdditionalURISignature.java?rev=1063768&r1=1063767&r2=1063768&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateDonaldsAdditionalURISignature.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateDonaldsAdditionalURISignature.java Wed Jan 26 16:00:40 2011
@@ -16,8 +16,6 @@
*/
package org.apache.xml.security.samples.signature;
-
-
import java.io.File;
import java.io.FileOutputStream;
import java.security.KeyPair;
@@ -35,210 +33,210 @@ import org.apache.xml.security.utils.XML
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-
/**
* Class CreateDonaldsAdditionalURISignature
*
* @author $Author$
- * @version $Revision$
*/
public class CreateDonaldsAdditionalURISignature {
- /** {@link org.apache.commons.logging} logging facility */
+ /** {@link org.apache.commons.logging} logging facility */
static org.apache.commons.logging.Log log =
org.apache.commons.logging.LogFactory.getLog(
CreateDonaldsAdditionalURISignature.class.getName());
- static Document createDocument(DocumentBuilder db) throws Exception {
- Document doc = db.newDocument();
- Element root = doc.createElementNS(null, "container");
- Element contents = doc.createElementNS(null, "signedContents");
-
- doc.appendChild(root);
- XMLUtils.addReturnToElement(root);
- root.appendChild(contents);
- XMLUtils.addReturnToElement(root);
- contents.appendChild(doc.createTextNode("\nSigned item\n\nfor questions, contact geuer-pollmann@nue.et-inf.uni-siegen.de\n"));
-
- return doc;
- }
-
- /**
- * Method signAndWrite
- *
- * @param db
- * @param privk
- * @param pubkey
- * @param SignatureURI
- * @param DigestURI
- * @param filename
- * @throws Exception
- */
- public static void signAndWrite(
- DocumentBuilder db, PrivateKey privk, PublicKey pubkey, String SignatureURI, String DigestURI, String filename)
- throws Exception {
-
- Document doc = createDocument(db);
- Element root = doc.getDocumentElement();
-
- File f = new File(filename);
- XMLSignature signature = new XMLSignature(doc, f.toURL().toString(),
- SignatureURI);
- Transforms transforms = new Transforms(doc);
-
- transforms.addTransform(Transforms.TRANSFORM_ENVELOPED_SIGNATURE);
- signature.addDocument("", transforms, DigestURI);
- signature.addKeyInfo(pubkey);
- root.appendChild(signature.getElement());
- XMLUtils.addReturnToElement(root);
- signature.sign(privk);
-
- FileOutputStream fos = new FileOutputStream(f);
-
- XMLUtils.outputDOMc14nWithComments(doc, fos);
-
- // System.out.println(new String(signature.getSignedInfo().getReferencedContentAfterTransformsItem(0).getBytes()));
- }
-
- /**
- * Method macAndWrite
- *
- * @param db
- * @param mackey
- * @param SignatureURI
- * @param DigestURI
- * @param filename
- * @throws Exception
- */
- public static void macAndWrite(
- DocumentBuilder db, byte[] mackey, String SignatureURI, String DigestURI, String filename)
- throws Exception {
- System.out.println(SignatureURI + " --- " + DigestURI);
-
-
- Document doc = createDocument(db);
- Element root = doc.getDocumentElement();
-
- File f = new File(filename);
- XMLSignature signature = new XMLSignature(doc, f.toURL().toString(),
- SignatureURI);
- Transforms transforms = new Transforms(doc);
-
- transforms.addTransform(Transforms.TRANSFORM_ENVELOPED_SIGNATURE);
- signature.addDocument("", transforms, DigestURI);
-
- SecretKey secretKey = signature.createSecretKey(mackey);
-
- root.appendChild(signature.getElement());
- XMLUtils.addReturnToElement(root);
- signature.sign(secretKey);
-
- FileOutputStream fos = new FileOutputStream(f);
-
- XMLUtils.outputDOMc14nWithComments(doc, fos);
-
- // System.out.println(new String(signature.getSignedInfo().getReferencedContentAfterTransformsItem(0).getBytes()));
- }
-
- /**
- * Method main
- *
- * @param unused
- * @throws Exception
- */
- public static void main(String unused[]) throws Exception {
-
- org.apache.xml.security.Init.init();
-
- javax.xml.parsers.DocumentBuilderFactory dbf =
- javax.xml.parsers.DocumentBuilderFactory.newInstance();
-
- dbf.setNamespaceAware(true);
-
- javax.xml.parsers.DocumentBuilder db = dbf.newDocumentBuilder();
-
- // test digests in references
- macAndWrite(db, "secret".getBytes("UTF-8"),
- XMLSignature.ALGO_ID_MAC_HMAC_SHA1,
- MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA1,
- "MacSha1_DigestSha1.xml");
- macAndWrite(db, "secret".getBytes("UTF-8"),
- XMLSignature.ALGO_ID_MAC_HMAC_SHA1,
- MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA256,
- "MacSha1_DigestSha256.xml");
- macAndWrite(db, "secret".getBytes("UTF-8"),
- XMLSignature.ALGO_ID_MAC_HMAC_SHA1,
- MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA384,
- "MacSha1_DigestSha384.xml");
- macAndWrite(db, "secret".getBytes("UTF-8"),
- XMLSignature.ALGO_ID_MAC_HMAC_SHA1,
- MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA512,
- "MacSha1_DigestSha512.xml");
- macAndWrite(db, "secret".getBytes("UTF-8"),
- XMLSignature.ALGO_ID_MAC_HMAC_SHA1,
- MessageDigestAlgorithm.ALGO_ID_DIGEST_RIPEMD160,
- "MacSha1_DigestRipemd160.xml");
- macAndWrite(db, "secret".getBytes("UTF-8"),
- XMLSignature.ALGO_ID_MAC_HMAC_SHA1,
- MessageDigestAlgorithm.ALGO_ID_DIGEST_NOT_RECOMMENDED_MD5,
- "MacSha1_DigestMd5.xml");
-
-
- // test digests in hmacs
- macAndWrite(db, "secret".getBytes("UTF-8"),
- XMLSignature.ALGO_ID_MAC_HMAC_SHA1,
- MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA1,
- "MacSha1_DigestSha1.xml");
- macAndWrite(db, "secret".getBytes("UTF-8"),
- XMLSignature.ALGO_ID_MAC_HMAC_SHA256,
- MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA1,
- "MacSha256_DigestSha1.xml");
- macAndWrite(db, "secret".getBytes("UTF-8"),
- XMLSignature.ALGO_ID_MAC_HMAC_SHA384,
- MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA1,
- "MacSha384_DigestSha1.xml");
- macAndWrite(db, "secret".getBytes("UTF-8"),
- XMLSignature.ALGO_ID_MAC_HMAC_SHA512,
- MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA1,
- "MacSha512_DigestSha1.xml");
- macAndWrite(db, "secret".getBytes("UTF-8"),
- XMLSignature.ALGO_ID_MAC_HMAC_RIPEMD160,
- MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA1,
- "MacRipemd160_DigestSha1.xml");
- macAndWrite(db, "secret".getBytes("UTF-8"),
- XMLSignature.ALGO_ID_MAC_HMAC_NOT_RECOMMENDED_MD5,
- MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA1,
- "MacMd5_DigestSha1.xml");
-
- KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA", "BC");
- KeyPair keyPair = kpg.generateKeyPair();
- PrivateKey privateKey = keyPair.getPrivate();
- PublicKey pubkey = keyPair.getPublic();
-
- // test digests in RSA
- signAndWrite(db, privateKey, pubkey,
- XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA1,
- MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA1,
- "SignatureRsaSha1_DigestSha1.xml");
- signAndWrite(db, privateKey, pubkey,
- XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA256,
- MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA1,
- "SignatureRsaSha256_DigestSha1.xml");
- signAndWrite(db, privateKey, pubkey,
- XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA384,
- MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA1,
- "SignatureRsaSha384_DigestSha1.xml");
- signAndWrite(db, privateKey, pubkey,
- XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA512,
- MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA1,
- "SignatureRsaSha512_DigestSha1.xml");
- signAndWrite(db, privateKey, pubkey,
- XMLSignature.ALGO_ID_SIGNATURE_RSA_RIPEMD160,
- MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA1,
- "SignatureRsaRipemd160_DigestSha1.xml");
- signAndWrite(db, privateKey, pubkey,
- XMLSignature.ALGO_ID_SIGNATURE_NOT_RECOMMENDED_RSA_MD5,
- MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA1,
- "SignatureRsaMd5_DigestSha1.xml");
- }
+ static Document createDocument(DocumentBuilder db) throws Exception {
+ Document doc = db.newDocument();
+ Element root = doc.createElementNS(null, "container");
+ Element contents = doc.createElementNS(null, "signedContents");
+
+ doc.appendChild(root);
+ XMLUtils.addReturnToElement(root);
+ root.appendChild(contents);
+ XMLUtils.addReturnToElement(root);
+ contents.appendChild(
+ doc.createTextNode(
+ "\nSigned item\n\nfor questions, contact geuer-pollmann@nue.et-inf.uni-siegen.de\n"));
+
+ return doc;
+ }
+
+ /**
+ * Method signAndWrite
+ *
+ * @param db
+ * @param privk
+ * @param pubkey
+ * @param SignatureURI
+ * @param DigestURI
+ * @param filename
+ * @throws Exception
+ */
+ public static void signAndWrite(
+ DocumentBuilder db, PrivateKey privk, PublicKey pubkey,
+ String SignatureURI, String DigestURI, String filename
+ ) throws Exception {
+
+ Document doc = createDocument(db);
+ Element root = doc.getDocumentElement();
+
+ File f = new File(filename);
+ XMLSignature signature =
+ new XMLSignature(doc, f.toURI().toURL().toString(), SignatureURI);
+ Transforms transforms = new Transforms(doc);
+
+ transforms.addTransform(Transforms.TRANSFORM_ENVELOPED_SIGNATURE);
+ signature.addDocument("", transforms, DigestURI);
+ signature.addKeyInfo(pubkey);
+ root.appendChild(signature.getElement());
+ XMLUtils.addReturnToElement(root);
+ signature.sign(privk);
+
+ FileOutputStream fos = new FileOutputStream(f);
+
+ XMLUtils.outputDOMc14nWithComments(doc, fos);
+
+ // System.out.println(new String(signature.getSignedInfo().getReferencedContentAfterTransformsItem(0).getBytes()));
+ }
+
+ /**
+ * Method macAndWrite
+ *
+ * @param db
+ * @param mackey
+ * @param SignatureURI
+ * @param DigestURI
+ * @param filename
+ * @throws Exception
+ */
+ public static void macAndWrite(
+ DocumentBuilder db, byte[] mackey, String SignatureURI, String DigestURI, String filename
+ ) throws Exception {
+ System.out.println(SignatureURI + " --- " + DigestURI);
+
+ Document doc = createDocument(db);
+ Element root = doc.getDocumentElement();
+
+ File f = new File(filename);
+ XMLSignature signature =
+ new XMLSignature(doc, f.toURI().toURL().toString(), SignatureURI);
+ Transforms transforms = new Transforms(doc);
+
+ transforms.addTransform(Transforms.TRANSFORM_ENVELOPED_SIGNATURE);
+ signature.addDocument("", transforms, DigestURI);
+
+ SecretKey secretKey = signature.createSecretKey(mackey);
+
+ root.appendChild(signature.getElement());
+ XMLUtils.addReturnToElement(root);
+ signature.sign(secretKey);
+
+ FileOutputStream fos = new FileOutputStream(f);
+
+ XMLUtils.outputDOMc14nWithComments(doc, fos);
+
+ // System.out.println(new String(signature.getSignedInfo().getReferencedContentAfterTransformsItem(0).getBytes()));
+ }
+
+ /**
+ * Method main
+ *
+ * @param unused
+ * @throws Exception
+ */
+ public static void main(String unused[]) throws Exception {
+
+ org.apache.xml.security.Init.init();
+
+ javax.xml.parsers.DocumentBuilderFactory dbf =
+ javax.xml.parsers.DocumentBuilderFactory.newInstance();
+
+ dbf.setNamespaceAware(true);
+
+ javax.xml.parsers.DocumentBuilder db = dbf.newDocumentBuilder();
+
+ // test digests in references
+ macAndWrite(db, "secret".getBytes("UTF-8"),
+ XMLSignature.ALGO_ID_MAC_HMAC_SHA1,
+ MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA1,
+ "MacSha1_DigestSha1.xml");
+ macAndWrite(db, "secret".getBytes("UTF-8"),
+ XMLSignature.ALGO_ID_MAC_HMAC_SHA1,
+ MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA256,
+ "MacSha1_DigestSha256.xml");
+ macAndWrite(db, "secret".getBytes("UTF-8"),
+ XMLSignature.ALGO_ID_MAC_HMAC_SHA1,
+ MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA384,
+ "MacSha1_DigestSha384.xml");
+ macAndWrite(db, "secret".getBytes("UTF-8"),
+ XMLSignature.ALGO_ID_MAC_HMAC_SHA1,
+ MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA512,
+ "MacSha1_DigestSha512.xml");
+ macAndWrite(db, "secret".getBytes("UTF-8"),
+ XMLSignature.ALGO_ID_MAC_HMAC_SHA1,
+ MessageDigestAlgorithm.ALGO_ID_DIGEST_RIPEMD160,
+ "MacSha1_DigestRipemd160.xml");
+ macAndWrite(db, "secret".getBytes("UTF-8"),
+ XMLSignature.ALGO_ID_MAC_HMAC_SHA1,
+ MessageDigestAlgorithm.ALGO_ID_DIGEST_NOT_RECOMMENDED_MD5,
+ "MacSha1_DigestMd5.xml");
+
+ // test digests in hmacs
+ macAndWrite(db, "secret".getBytes("UTF-8"),
+ XMLSignature.ALGO_ID_MAC_HMAC_SHA1,
+ MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA1,
+ "MacSha1_DigestSha1.xml");
+ macAndWrite(db, "secret".getBytes("UTF-8"),
+ XMLSignature.ALGO_ID_MAC_HMAC_SHA256,
+ MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA1,
+ "MacSha256_DigestSha1.xml");
+ macAndWrite(db, "secret".getBytes("UTF-8"),
+ XMLSignature.ALGO_ID_MAC_HMAC_SHA384,
+ MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA1,
+ "MacSha384_DigestSha1.xml");
+ macAndWrite(db, "secret".getBytes("UTF-8"),
+ XMLSignature.ALGO_ID_MAC_HMAC_SHA512,
+ MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA1,
+ "MacSha512_DigestSha1.xml");
+ macAndWrite(db, "secret".getBytes("UTF-8"),
+ XMLSignature.ALGO_ID_MAC_HMAC_RIPEMD160,
+ MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA1,
+ "MacRipemd160_DigestSha1.xml");
+ macAndWrite(db, "secret".getBytes("UTF-8"),
+ XMLSignature.ALGO_ID_MAC_HMAC_NOT_RECOMMENDED_MD5,
+ MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA1,
+ "MacMd5_DigestSha1.xml");
+
+ KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA", "BC");
+ KeyPair keyPair = kpg.generateKeyPair();
+ PrivateKey privateKey = keyPair.getPrivate();
+ PublicKey pubkey = keyPair.getPublic();
+
+ // test digests in RSA
+ signAndWrite(db, privateKey, pubkey,
+ XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA1,
+ MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA1,
+ "SignatureRsaSha1_DigestSha1.xml");
+ signAndWrite(db, privateKey, pubkey,
+ XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA256,
+ MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA1,
+ "SignatureRsaSha256_DigestSha1.xml");
+ signAndWrite(db, privateKey, pubkey,
+ XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA384,
+ MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA1,
+ "SignatureRsaSha384_DigestSha1.xml");
+ signAndWrite(db, privateKey, pubkey,
+ XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA512,
+ MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA1,
+ "SignatureRsaSha512_DigestSha1.xml");
+ signAndWrite(db, privateKey, pubkey,
+ XMLSignature.ALGO_ID_SIGNATURE_RSA_RIPEMD160,
+ MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA1,
+ "SignatureRsaRipemd160_DigestSha1.xml");
+ signAndWrite(db, privateKey, pubkey,
+ XMLSignature.ALGO_ID_SIGNATURE_NOT_RECOMMENDED_RSA_MD5,
+ MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA1,
+ "SignatureRsaMd5_DigestSha1.xml");
+ }
+
}
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateEnvelopingSignature.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateEnvelopingSignature.java?rev=1063768&r1=1063767&r2=1063768&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateEnvelopingSignature.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateEnvelopingSignature.java Wed Jan 26 16:00:40 2011
@@ -16,8 +16,6 @@
*/
package org.apache.xml.security.samples.signature;
-
-
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -32,96 +30,93 @@ import org.apache.xml.security.utils.Con
import org.apache.xml.security.utils.XMLUtils;
import org.w3c.dom.Element;
-
/**
- *
- *
* @author $Author$
*/
public class CreateEnvelopingSignature {
- /** {@link org.apache.commons.logging} logging facility */
+ /** {@link org.apache.commons.logging} logging facility */
static org.apache.commons.logging.Log log =
org.apache.commons.logging.LogFactory.getLog(CreateSignature.class.getName());
- /**
- * Method main
- *
- * @param unused
- * @throws Exception
- */
- public static void main(String unused[]) throws Exception {
- //J-
- String keystoreType = "JKS";
- String keystoreFile = "data/org/apache/xml/security/samples/input/keystore.jks";
- String keystorePass = "xmlsecurity";
- String privateKeyAlias = "test";
- String privateKeyPass = "xmlsecurity";
- String certificateAlias = "test";
- File signatureFile = new File("signature.xml");
- //J+
- KeyStore ks = KeyStore.getInstance(keystoreType);
- FileInputStream fis = new FileInputStream(keystoreFile);
-
- ks.load(fis, keystorePass.toCharArray());
-
- PrivateKey privateKey = (PrivateKey) ks.getKey(privateKeyAlias,
- privateKeyPass.toCharArray());
- javax.xml.parsers.DocumentBuilderFactory dbf =
- javax.xml.parsers.DocumentBuilderFactory.newInstance();
-
- dbf.setNamespaceAware(true);
-
- javax.xml.parsers.DocumentBuilder db = dbf.newDocumentBuilder();
- org.w3c.dom.Document doc = db.newDocument();
- String BaseURI = signatureFile.toURL().toString();
- XMLSignature sig = new XMLSignature(doc, BaseURI,
- XMLSignature.ALGO_ID_SIGNATURE_DSA);
-
- doc.appendChild(sig.getElement());
-
- {
- ObjectContainer obj = new ObjectContainer(doc);
- Element anElement = doc.createElementNS(null, "InsideObject");
-
- anElement.appendChild(doc.createTextNode("A text in a box"));
- obj.appendChild(anElement);
-
- String Id = "TheFirstObject";
-
- obj.setId(Id);
- sig.appendObject(obj);
-
- Transforms transforms = new Transforms(doc);
-
- transforms.addTransform(Transforms.TRANSFORM_C14N_WITH_COMMENTS);
- sig.addDocument("#" + Id, transforms, Constants.ALGO_ID_DIGEST_SHA1);
- }
-
- {
- X509Certificate cert =
- (X509Certificate) ks.getCertificate(certificateAlias);
-
- sig.addKeyInfo(cert);
- sig.addKeyInfo(cert.getPublicKey());
- System.out.println("Start signing");
- sig.sign(privateKey);
- System.out.println("Finished signing");
- }
-
- FileOutputStream f = new FileOutputStream(signatureFile);
-
- XMLUtils.outputDOMc14nWithComments(doc, f);
- f.close();
- System.out.println("Wrote signature to " + BaseURI);
-
- for (int i=0; i<sig.getSignedInfo().getSignedContentLength(); i++) {
- System.out.println("--- Signed Content follows ---");
- System.out.println(new String(sig.getSignedInfo().getSignedContentItem(i)));
- }
- }
-
- static {
- org.apache.xml.security.Init.init();
- }
+ static {
+ org.apache.xml.security.Init.init();
+ }
+
+ /**
+ * Method main
+ *
+ * @param unused
+ * @throws Exception
+ */
+ public static void main(String unused[]) throws Exception {
+ String keystoreType = "JKS";
+ String keystoreFile = "samples/data/keystore.jks";
+ String keystorePass = "xmlsecurity";
+ String privateKeyAlias = "test";
+ String privateKeyPass = "xmlsecurity";
+ String certificateAlias = "test";
+ File signatureFile = new File("signature.xml");
+
+ KeyStore ks = KeyStore.getInstance(keystoreType);
+ FileInputStream fis = new FileInputStream(keystoreFile);
+
+ ks.load(fis, keystorePass.toCharArray());
+
+ PrivateKey privateKey =
+ (PrivateKey) ks.getKey(privateKeyAlias, privateKeyPass.toCharArray());
+ javax.xml.parsers.DocumentBuilderFactory dbf =
+ javax.xml.parsers.DocumentBuilderFactory.newInstance();
+
+ dbf.setNamespaceAware(true);
+
+ javax.xml.parsers.DocumentBuilder db = dbf.newDocumentBuilder();
+ org.w3c.dom.Document doc = db.newDocument();
+ String BaseURI = signatureFile.toURI().toURL().toString();
+ XMLSignature sig =
+ new XMLSignature(doc, BaseURI, XMLSignature.ALGO_ID_SIGNATURE_DSA);
+
+ doc.appendChild(sig.getElement());
+
+ {
+ ObjectContainer obj = new ObjectContainer(doc);
+ Element anElement = doc.createElementNS(null, "InsideObject");
+
+ anElement.appendChild(doc.createTextNode("A text in a box"));
+ obj.appendChild(anElement);
+
+ String Id = "TheFirstObject";
+
+ obj.setId(Id);
+ sig.appendObject(obj);
+
+ Transforms transforms = new Transforms(doc);
+
+ transforms.addTransform(Transforms.TRANSFORM_C14N_WITH_COMMENTS);
+ sig.addDocument("#" + Id, transforms, Constants.ALGO_ID_DIGEST_SHA1);
+ }
+
+ {
+ X509Certificate cert =
+ (X509Certificate) ks.getCertificate(certificateAlias);
+
+ sig.addKeyInfo(cert);
+ sig.addKeyInfo(cert.getPublicKey());
+ System.out.println("Start signing");
+ sig.sign(privateKey);
+ System.out.println("Finished signing");
+ }
+
+ FileOutputStream f = new FileOutputStream(signatureFile);
+
+ XMLUtils.outputDOMc14nWithComments(doc, f);
+ f.close();
+ System.out.println("Wrote signature to " + BaseURI);
+
+ for (int i = 0; i < sig.getSignedInfo().getSignedContentLength(); i++) {
+ System.out.println("--- Signed Content follows ---");
+ System.out.println(new String(sig.getSignedInfo().getSignedContentItem(i)));
+ }
+ }
+
}