apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

ssh: Add support for ecdsa and ed25519 public keys (#3740)

Browse Source 
See #3705
Fixes: #3705

Signed-off-by: Kai Takahashi <k-takahashi@creationline.com>
This commit is contained in:
Kai Takahashi 2019-12-06 21:54:35 +09:00 committed by Rohit Yadav
parent 828405d297
commit e56fa31379
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
utils/src/main/java/com/cloud/utils/ssh/SSHKeysHelper.java
View File

@ -88,7 +88,13 @@ public class SSHKeysHelper {
if (!keyMaterial.contains(" "))
keyMaterial = new String(Base64.decodeBase64(keyMaterial.getBytes()));
if ((!keyMaterial.startsWith("ssh-rsa") && !keyMaterial.startsWith("ssh-dss")) || !keyMaterial.contains(" "))
if ((!keyMaterial.startsWith("ssh-rsa")
&& !keyMaterial.startsWith("ssh-dss")
&& !keyMaterial.startsWith("ecdsa-sha2-nistp256")
&& !keyMaterial.startsWith("ecdsa-sha2-nistp384")
&& !keyMaterial.startsWith("ecdsa-sha2-nistp521")
&& !keyMaterial.startsWith("ssh-ed25519"))
|| !keyMaterial.contains(" "))
return null;
String[] key = keyMaterial.split(" ");