Merge pull request #595 from amedee/ssh-key-check-too-strict

SSH key check is too strict
jenkinsci · Apr 13, 2021 · a674aee · a674aee
2 parents 366e80d + c64692f
commit a674aee
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/main/java/hudson/plugins/ec2/EC2Cloud.java b/src/main/java/hudson/plugins/ec2/EC2Cloud.java
@@ -1102,9 +1102,11 @@ public FormValidation doCheckSshKeysCredentialsId(@QueryParameter String value)
             BufferedReader br = new BufferedReader(new StringReader(privateKey));
             String line;
             while ((line = br.readLine()) != null) {
-                if (line.equals("-----BEGIN RSA PRIVATE KEY-----"))
+                if (line.equals("-----BEGIN RSA PRIVATE KEY-----") ||
+                        line.equals("-----BEGIN OPENSSH PRIVATE KEY-----"))
                     hasStart = true;
-                if (line.equals("-----END RSA PRIVATE KEY-----"))
+                if (line.equals("-----END RSA PRIVATE KEY-----") ||
+                        line.equals("-----END OPENSSH PRIVATE KEY-----"))
                     hasEnd = true;
             }
             if (!hasStart)