diff --git a/WHATSNEW b/WHATSNEW index 86504f2c9..3284d9854 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -12,6 +12,9 @@ Other changes: compiled attribute to scriptdef. Github Pull Request #30 + * Added support for jarsigner's -tsadigestalg to . + Bugzilla Report 60665 + Fixed bugs: ----------- diff --git a/manual/Tasks/signjar.html b/manual/Tasks/signjar.html index 0f9d77846..0ff24df58 100644 --- a/manual/Tasks/signjar.html +++ b/manual/Tasks/signjar.html @@ -184,6 +184,11 @@ block name of digest algorithm No + + tsadigestalg + name of tsa digest algorithm. since Ant 1.10.2 + No +

Parameters as nested elements

diff --git a/src/main/org/apache/tools/ant/taskdefs/SignJar.java b/src/main/org/apache/tools/ant/taskdefs/SignJar.java index fc31b1d3d..ed271d81c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/SignJar.java +++ b/src/main/org/apache/tools/ant/taskdefs/SignJar.java @@ -128,6 +128,11 @@ public class SignJar extends AbstractJarSignerTask { */ private String digestAlg; + /** + * tsa digest algorithm + */ + private String tsaDigestAlg; + /** * error string for unit test verification: {@value} */ @@ -362,6 +367,24 @@ public class SignJar extends AbstractJarSignerTask { return digestAlg; } + /** + * TSA Digest Algorithm; optional + * + * @param digestAlg the tsa digest algorithm + * @since Ant 1.10.2 + */ + public void setTSADigestAlg(String digestAlg) { + this.tsaDigestAlg = digestAlg; + } + + /** + * TSA Digest Algorithm; optional + * @since Ant 1.10.2 + */ + public String getTSADigestAlg() { + return tsaDigestAlg; + } + /** * sign the jar(s) * @@ -564,6 +587,11 @@ public class SignJar extends AbstractJarSignerTask { addProxyFor(cmd, "http"); } } + + if (tsaDigestAlg != null) { + addValue(cmd, "-tsadigestalg"); + addValue(cmd, tsaDigestAlg); + } } /**