Fixed the typo on the withTimestampingAuthority() methods in PESigner (…

…Fixes #43)
ebourg · Nov 3, 2017 · f825653 · f825653
1 parent 3aa737c
commit f825653
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -27,6 +27,7 @@ Changes
 
 Version 2.1 (in development)
 * The first timestamping authority specified is no longer skipped (contributed by Thomas Atzmueller)
+* Fixed the typo on the withTimestampingAuthority() methods in PESigner (contributed by Bjørn Madsen)
 * Upgraded BouncyCastle to 1.57
 
 Version 2.0 (2017-06-12)

diff --git a/jsign-core/src/main/java/net/jsign/PESigner.java b/jsign-core/src/main/java/net/jsign/PESigner.java
@@ -177,22 +177,45 @@ public PESigner withTimestampingMode(TimestampingMode tsmode) {
     /**
      * Set the URL of the timestamping authority. RFC 3161 servers as used
      * for jar signing are not compatible with Authenticode signatures.
+     * 
+     * @since 2.1
+     */
+    public PESigner withTimestampingAuthority(String url) {
+        return withTimestampingAuthority(new String[] { url });
+    }
+
+    /**
+     * Set the URL of the timestamping authority. RFC 3161 servers as used
+     * for jar signing are not compatible with Authenticode signatures.
+     * 
+     * @deprecated
      */
     public PESigner withTimestampingAutority(String url) {
-        return withTimestampingAutority(new String[] { url });
+        return withTimestampingAuthority(url);
     }
 
     /**
      * Set the URL of the timestamping authority. RFC 3161 servers as used
      * for jar signing are not compatible with Authenticode signatures.
      * 
-     * @since 2.0
+     * @since 2.1
      */
-    public PESigner withTimestampingAutority(String... url) {
+    public PESigner withTimestampingAuthority(String... url) {
         this.tsaurlOverride = url;
         return this;
     }
-
+
+    /**
+     * Set the URL of the timestamping authority. RFC 3161 servers as used
+     * for jar signing are not compatible with Authenticode signatures.
+     *
+     * @since 2.0
+     * @deprecated
+     */
+    public PESigner withTimestampingAutority(String... url) {
+        return withTimestampingAuthority(url);
+    }
+
     /**
      * Set the Timestamper implementation.
      */

diff --git a/jsign-core/src/main/java/net/jsign/PESignerHelper.java b/jsign-core/src/main/java/net/jsign/PESignerHelper.java
@@ -346,7 +346,7 @@ public PESigner build() throws SignerException {
                 .withTimestampingMode(tsmode != null ? TimestampingMode.of(tsmode) : TimestampingMode.AUTHENTICODE)
                 .withTimestampingRetries(tsretries)
                 .withTimestampingRetryWait(tsretrywait)
-                .withTimestampingAutority(tsaurl != null ? tsaurl.split(",") : null);
+                .withTimestampingAuthority(tsaurl != null ? tsaurl.split(",") : null);
     }
 
     public void sign(File file) throws SignerException {

diff --git a/jsign-core/src/test/java/net/jsign/PESignerTest.java b/jsign-core/src/test/java/net/jsign/PESignerTest.java
@@ -385,15 +385,15 @@ public void testReplaceSignature() throws Exception {
         assertEquals("Digest algorithm", DigestAlgorithm.SHA256.oid, signatures.get(0).getDigestAlgorithmIDs().iterator().next().getAlgorithm());
     }
 
-    public void testInvalidAuthenticodeTimestampingAutority() throws Exception {
-        testInvalidTimestampingAutority(TimestampingMode.AUTHENTICODE);
+    public void testInvalidAuthenticodeTimestampingAuthority() throws Exception {
+        testInvalidTimestampingAuthority(TimestampingMode.AUTHENTICODE);
     }
 
-    public void testInvalidRFC3161TimestampingAutority() throws Exception {
-        testInvalidTimestampingAutority(TimestampingMode.RFC3161);
+    public void testInvalidRFC3161TimestampingAuthority() throws Exception {
+        testInvalidTimestampingAuthority(TimestampingMode.RFC3161);
     }
 
-    public void testInvalidTimestampingAutority(TimestampingMode mode) throws Exception {
+    public void testInvalidTimestampingAuthority(TimestampingMode mode) throws Exception {
         File sourceFile = new File("target/test-classes/wineyes.exe");
         File targetFile = new File("target/test-classes/wineyes-timestamped-unavailable-" + mode.name().toLowerCase() + ".exe");
 
@@ -405,7 +405,7 @@ public void testInvalidTimestampingAutority(TimestampingMode mode) throws Except
         signer.withDigestAlgorithm(DigestAlgorithm.SHA1);
         signer.withTimestamping(true);
         signer.withTimestampingMode(mode);
-        signer.withTimestampingAutority("http://www.google.com/" + mode.name().toLowerCase());
+        signer.withTimestampingAuthority("http://www.google.com/" + mode.name().toLowerCase());
         signer.withTimestampingRetries(1);
 
         try {
@@ -422,15 +422,15 @@ public void testInvalidTimestampingAutority(TimestampingMode mode) throws Except
         assertTrue(signatures.isEmpty());
     }
 
-    public void testBrokenAuthenticodeTimestampingAutority() throws Exception {
-        testBrokenTimestampingAutority(TimestampingMode.AUTHENTICODE);
+    public void testBrokenAuthenticodeTimestampingAuthority() throws Exception {
+        testBrokenTimestampingAuthority(TimestampingMode.AUTHENTICODE);
     }
 
-    public void testBrokenRFC3161TimestampingAutority() throws Exception {
-        testBrokenTimestampingAutority(TimestampingMode.RFC3161);
+    public void testBrokenRFC3161TimestampingAuthority() throws Exception {
+        testBrokenTimestampingAuthority(TimestampingMode.RFC3161);
     }
 
-    public void testBrokenTimestampingAutority(TimestampingMode mode) throws Exception {
+    public void testBrokenTimestampingAuthority(TimestampingMode mode) throws Exception {
         File sourceFile = new File("target/test-classes/wineyes.exe");
         File targetFile = new File("target/test-classes/wineyes-timestamped-broken-" + mode.name().toLowerCase() + ".exe");
 
@@ -442,7 +442,7 @@ public void testBrokenTimestampingAutority(TimestampingMode mode) throws Excepti
         signer.withDigestAlgorithm(DigestAlgorithm.SHA1);
         signer.withTimestamping(true);
         signer.withTimestampingMode(mode);
-        signer.withTimestampingAutority("http://github.com");
+        signer.withTimestampingAuthority("http://github.com");
         signer.withTimestampingRetries(1);
 
         try {
@@ -465,7 +465,7 @@ public void testInvalidTimestampingURL() throws Exception {
         signer.withDigestAlgorithm(DigestAlgorithm.SHA1);
         signer.withTimestamping(true);
         signer.withTimestampingMode(TimestampingMode.RFC3161);
-        signer.withTimestampingAutority("example://example.com");
+        signer.withTimestampingAuthority("example://example.com");
         signer.withTimestampingRetries(1);
 
         try {
@@ -497,7 +497,7 @@ public void testTimestampingFailover(TimestampingMode mode, String validURL) thr
         signer.withTimestamping(true);
         signer.withTimestampingMode(mode);
         signer.withTimestampingRetryWait(1);
-        signer.withTimestampingAutority("http://www.google.com/" + mode.name().toLowerCase(), "http://github.com", validURL);
+        signer.withTimestampingAuthority("http://www.google.com/" + mode.name().toLowerCase(), "http://github.com", validURL);
 
         signer.sign(peFile);