Merge 1.9.x branch

CONTRIBUTORS

@@ -206,6 +206,7 @@ Josh Lucas
 Juerg Wanner
 Julian Simpson
 Justin Vallon
+Karl Jansen
 Keiron Liddle
 Keith Visco
 Kevin Connor Arpe

WHATSNEW

@@ -1,6 +1,12 @@
 Changes from Ant 1.10.5 TO Ant 1.10.6
 =====================================
 
+Other changes:
+--------------
+ * generatekey task now supports SubjectAlternativeName during key
+   generation.
+
+
 Changes from Ant 1.10.4 TO Ant 1.10.5
 =====================================
 

src/main/org/apache/tools/ant/taskdefs/GenerateKey.java

@@ -150,6 +150,7 @@ public class GenerateKey extends Task {
 
     protected String sigalg;
     protected String keyalg;
+    protected String saname;
     protected String dname;
     protected DistinguishedName expandedDname;
     protected int keysize;
@@ -189,6 +190,21 @@ public class GenerateKey extends Task {
         this.dname = dname;
     }
 
+    /**
+     * The subject alternative name for entity.
+     *
+     * @param saname subject alternative name
+     * @since Ant 1.9.14
+     */
+    public void setSaname(final String saname) {
+        if (JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_1_7)) {
+            this.saname = saname;
+        } else {
+            log("The SubjectAlternativeName extension is not available for "
+               +"the Java Version being used.");
+        }
+    }
+
     /**
      * The alias to add under.
      *
@@ -381,6 +397,13 @@ public class GenerateKey extends Task {
             sb.append("\" ");
         }
 
+        if (null != saname) {
+            sb.append("-ext ");
+            sb.append("\"san=");
+            sb.append(saname);
+            sb.append("\" ");
+        }
+
         log("Generating Key for " + alias);
         final ExecTask cmd = new ExecTask(this);
         cmd.setExecutable(JavaEnvUtils.getJdkExecutable("keytool"));
@@ -391,4 +414,3 @@ public class GenerateKey extends Task {
         cmd.execute();
     }
 }
-