Added support for ECDSA SSH keys.

skavanagh · skavanagh · commit 5a7c534005cb · 2015-11-28T10:14:22.000-05:00
Added support for ECDSA SSH keys. Closes bastillion-io#94
diff --git a/src/main/java/com/keybox/manage/action/AuthKeysAction.java b/src/main/java/com/keybox/manage/action/AuthKeysAction.java
@@ -228,7 +228,12 @@ public String downloadPvtKey() {
 	public String generateUserKey(String username, String keyname) {
 
 		//set key type
-		int type = SSHUtil.KEY_TYPE.equals("rsa") ? KeyPair.RSA : KeyPair.DSA;
+		int type = KeyPair.RSA;
+		if(SSHUtil.KEY_TYPE.equals("dsa")) {
+			type = KeyPair.DSA;
+		} else if(SSHUtil.KEY_TYPE.equals("ecdsa")) {
+			type = KeyPair.ECDSA;
+		}
 
 		JSch jsch = new JSch();
 				
diff --git a/src/main/java/com/keybox/manage/util/SSHUtil.java b/src/main/java/com/keybox/manage/util/SSHUtil.java
@@ -167,7 +167,12 @@ public static String keyGen(String passphrase) {
 		if (StringUtils.isEmpty(AppConfig.getProperty("privateKey")) || StringUtils.isEmpty(AppConfig.getProperty("publicKey"))) {
 
 			//set key type
-			int type = KEY_TYPE.equals("rsa") ? KeyPair.RSA : KeyPair.DSA;
+			int type = KeyPair.RSA;
+			if(SSHUtil.KEY_TYPE.equals("dsa")) {
+				type = KeyPair.DSA;
+			} else if(SSHUtil.KEY_TYPE.equals("ecdsa")) {
+				type = KeyPair.ECDSA;
+			}
 			String comment = "keybox@global_key";
 
 			JSch jsch = new JSch();
@@ -623,6 +628,8 @@ public static String getKeyType(String publicKey){
 						keyType="DSA";
 					} else if (KeyPair.RSA == type){
 						keyType="RSA";
+					} else if (KeyPair.ECDSA == type){
+						keyType="ECDSA";
 					} else if(KeyPair.UNKNOWN ==type){
 						keyType="UNKNOWN";
 					} else if(KeyPair.ERROR == type){
diff --git a/src/main/resources/KeyBoxConfig.properties b/src/main/resources/KeyBoxConfig.properties
@@ -4,9 +4,9 @@
 #
 #set to true to regenerate and import SSH keys
 resetApplicationSSHKey=false
-#SSH Key Type 'dsa' or 'rsa' for generated keys
+#SSH key type 'dsa', 'rsa', or 'ecdsa' for generated keys
 sshKeyType=rsa
-#SSH Key Length for generated keys
+#SSH key length for generated keys. 2048 => 'rsa','dsa'; 521 => 'ecdsa'
 sshKeyLength=2048
 #private ssh key, leave blank to generate key pair
 privateKey=
