Skip to content
This repository has been archived by the owner. It is now read-only.

Commit

Permalink
Sign using xmlsectool 2.0.0, still verify with multiple versions.
Browse files Browse the repository at this point in the history
  • Loading branch information
@iay
iay committed Jun 28, 2016
1 parent 8e35ee3 commit 9d22c70
Showing 1 changed file with 32 additions and 32 deletions.
64 changes: 32 additions & 32 deletions build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@
<property name="tools.mda" value="${tools.dir}/aggregator-cli-0.9.1"/>
<property name="tools.mdnorm" value="${tools.dir}/mdnorm"/>
<property name="tools.metadatatool" value="${tools.dir}/metadatatool"/>
<property name="tools.xmlsectool" value="${tools.dir}/xmlsectool"/>
<property name="tools.xmlsectool.new" value="${tools.dir}/xmlsectool-2.0.0/"/>
<property name="tools.xmlsectool.old" value="${tools.dir}/xmlsectool"/>
<property name="tools.xmlsectool" value="${tools.dir}/xmlsectool-2.0.0/"/>
<property name="tools.xalan" value="${tools.dir}/xalan"/>

<!--
Expand Down Expand Up @@ -615,26 +615,26 @@
</macrodef>

<!--
*****************************************
*** ***
*** X M L S E C T O O L T O O L ***
*** ***
*****************************************
*****************************************************
*** ***
*** X M L S E C T O O L T O O L ( O L D ) ***
*** ***
*****************************************************
-->

<macrodef name="XMLSECTOOL">
<macrodef name="XMLSECTOOL.old">
<attribute name="i"/><!-- input file, assumed to be in the XML directory -->
<element name="args" optional="yes"/>
<sequential>
<java classname="edu.internet2.middleware.security.XmlSecTool"
fork="true" failonerror="true" maxmemory="${java.max.memory}">
<classpath>
<fileset dir="${tools.xmlsectool}/lib">
<fileset dir="${tools.xmlsectool.old}/lib">
<include name="*.jar"/>
</fileset>
</classpath>
<jvmarg value="-Djava.endorsed.dirs=${tools.xmlsectool}/lib/endorsed"/>
<jvmarg value="-Dedu.internet2.middleware.security.XmlSecTool.home=${tools.xmlsectool}"/>
<jvmarg value="-Djava.endorsed.dirs=${tools.xmlsectool.old}/lib/endorsed"/>
<jvmarg value="-Dedu.internet2.middleware.security.XmlSecTool.home=${tools.xmlsectool.old}"/>
<args/>
<arg value="--validateSchema"/>
<arg value="--schemaDirectory"/>
Expand All @@ -645,7 +645,7 @@
</sequential>
</macrodef>

<macrodef name="XMLSECTOOL.SIGN.uk">
<macrodef name="XMLSECTOOL.old.SIGN.uk">
<attribute name="i"/><!-- input file, assumed to be in the XML directory -->
<attribute name="o"/><!-- output file, assumed to be in the XML directory -->
<attribute name="digest"/><!-- digest function to use -->
Expand All @@ -656,7 +656,7 @@
<echo>Signing @{i} using digest @{digest}.</echo>

<!-- perform signing operation into temporary file -->
<XMLSECTOOL i="@{i}">
<XMLSECTOOL.old i="@{i}">
<args>
<arg value="--sign"/>

Expand Down Expand Up @@ -687,18 +687,18 @@
<arg value="- -quiet"/>
-->
</args>
</XMLSECTOOL>
</XMLSECTOOL.old>

<!-- Force the output file to use Unix line endings -->
<fixcrlf file="${xml.dir}/@{o}" eol="lf" encoding="UTF-8"/>

</sequential>
</macrodef>

<macrodef name="XMLSECTOOL.VFY.uk">
<macrodef name="XMLSECTOOL.old.VFY.uk">
<attribute name="i"/><!-- input file, assumed to be in the XML directory -->
<sequential>
<XMLSECTOOL i="@{i}">
<XMLSECTOOL.old i="@{i}">
<args>
<arg value="--verifySignature"/>
<arg value="--certificate"/>
Expand All @@ -707,26 +707,26 @@
<arg value="- -quiet"/>
-->
</args>
</XMLSECTOOL>
</XMLSECTOOL.old>
</sequential>
</macrodef>

<!--
***************************************************
*** ***
*** X M L S E C T O O L T O O L ( N E W ) ***
*** ***
***************************************************
*****************************************
*** ***
*** X M L S E C T O O L T O O L ***
*** ***
*****************************************
-->

<macrodef name="XMLSECTOOL.new">
<macrodef name="XMLSECTOOL">
<attribute name="i"/><!-- input file, assumed to be in the XML directory -->
<element name="args" optional="yes"/>
<sequential>
<java classname="net.shibboleth.tool.xmlsectool.XMLSecTool"
fork="true" failonerror="true" maxmemory="${java.max.memory}">
<classpath>
<fileset dir="${tools.xmlsectool.new}/lib">
<fileset dir="${tools.xmlsectool}/lib">
<include name="*.jar"/>
</fileset>
</classpath>
Expand All @@ -740,7 +740,7 @@
</sequential>
</macrodef>

<macrodef name="XMLSECTOOL.new.SIGN.uk">
<macrodef name="XMLSECTOOL.SIGN.uk">
<attribute name="i"/><!-- input file, assumed to be in the XML directory -->
<attribute name="o"/><!-- output file, assumed to be in the XML directory -->
<attribute name="digest"/><!-- digest function to use -->
Expand All @@ -751,7 +751,7 @@
<echo>Signing @{i} using digest @{digest}.</echo>

<!-- perform signing operation into temporary file -->
<XMLSECTOOL.new i="@{i}">
<XMLSECTOOL i="@{i}">
<args>
<arg value="--sign"/>

Expand Down Expand Up @@ -782,18 +782,18 @@
<arg value="- -quiet"/>
-->
</args>
</XMLSECTOOL.new>
</XMLSECTOOL>

<!-- Force the output file to use Unix line endings -->
<fixcrlf file="${xml.dir}/@{o}" eol="lf" encoding="UTF-8"/>

</sequential>
</macrodef>

<macrodef name="XMLSECTOOL.new.VFY.uk">
<macrodef name="XMLSECTOOL.VFY.uk">
<attribute name="i"/><!-- input file, assumed to be in the XML directory -->
<sequential>
<XMLSECTOOL.new i="@{i}">
<XMLSECTOOL i="@{i}">
<args>
<arg value="--verifySignature"/>
<arg value="--certificate"/>
Expand All @@ -802,7 +802,7 @@
<arg value="- -quiet"/>
-->
</args>
</XMLSECTOOL.new>
</XMLSECTOOL>
</sequential>
</macrodef>

Expand Down Expand Up @@ -941,9 +941,9 @@
<XMLSECTOOL.VFY.uk i="@{i}"/>

<!--
Verify using new version of xmlsectool.
Verify using old version of xmlsectool.
-->
<XMLSECTOOL.new.VFY.uk i="@{i}"/>
<XMLSECTOOL.old.VFY.uk i="@{i}"/>

</sequential>
</macrodef>
Expand Down

0 comments on commit 9d22c70

Please sign in to comment.