You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2018/03/20 11:17:01 UTC
[2/5] ant git commit: add a PKCS12 test keystore
add a PKCS12 test keystore
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/f2dd4149
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/f2dd4149
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/f2dd4149
Branch: refs/heads/master
Commit: f2dd4149dc0f09563db980b9e4afb3ac4cfb8576
Parents: ea5bb77
Author: Stefan Bodewig <bo...@apache.org>
Authored: Tue Mar 20 11:56:29 2018 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Tue Mar 20 11:56:29 2018 +0100
----------------------------------------------------------------------
src/etc/testcases/testkeystore.pkcs12 | Bin 0 -> 2945 bytes
src/tests/antunit/taskdefs/signjar-test.xml | 14 ++++++++++++++
2 files changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/f2dd4149/src/etc/testcases/testkeystore.pkcs12
----------------------------------------------------------------------
diff --git a/src/etc/testcases/testkeystore.pkcs12 b/src/etc/testcases/testkeystore.pkcs12
new file mode 100644
index 0000000..c0016c5
Binary files /dev/null and b/src/etc/testcases/testkeystore.pkcs12 differ
http://git-wip-us.apache.org/repos/asf/ant/blob/f2dd4149/src/tests/antunit/taskdefs/signjar-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/signjar-test.xml b/src/tests/antunit/taskdefs/signjar-test.xml
index 0f03bc5..4d998fb 100644
--- a/src/tests/antunit/taskdefs/signjar-test.xml
+++ b/src/tests/antunit/taskdefs/signjar-test.xml
@@ -25,6 +25,7 @@
<property name="signtest.jar" location="${sign.dir}/signtest.jar" />
<property name="subdirsigntest.jar" location="${subdir}/signtest.jar" />
<property name="testkeystore" location="../../../etc/testcases/testkeystore" />
+ <property name="testkeystore.pkcs12" location="${testkeystore}.pkcs12" />
<macrodef name="assertSigned">
<attribute name="jar" default="${signtest.jar}" />
@@ -43,6 +44,11 @@
<verifyjar keystore="${testkeystore}" storepass="apacheant" />
</presetdef>
+ <presetdef name="verify-base-pkcs12">
+ <verifyjar keystore="${testkeystore.pkcs12}" storepass="apacheant"
+ storetype="pkcs12" alias="testonly"/>
+ </presetdef>
+
<presetdef name="sign">
<sign-base jar="${signtest.jar}" />
</presetdef>
@@ -60,6 +66,10 @@
<sign />
</target>
+ <target name="basic-pkcs12" depends="jar">
+ <sign keystore="${testkeystore.pkcs12}" storetype="pkcs12" strict="true"/>
+ </target>
+
<target name="testBasic" depends="basic">
<assertSigned />
</target>
@@ -232,6 +242,10 @@
<verify-base jar="${signtest.jar}" />
</target>
+ <target name="testVerifyJarPKCS12" depends="basic-pkcs12">
+ <verify-base-pkcs12 jar="${signtest.jar}" />
+ </target>
+
<target name="testVerifyJarCertificates" depends="basic">
<verify-base jar="${signtest.jar}" certificates="true" verbose="true" />
</target>