added support for PuTTY key format

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@9266 71c3de6d-444a-0410-be80-ed276b4c234a

core/pom.xml

@@ -268,6 +268,11 @@
       <artifactId>svnkit</artifactId>
       <version>1.1.6-hudson-3</version>
     </dependency>
+    <dependency>
+      <groupId>org.kohsuke</groupId>
+      <artifactId>trilead-putty-extension</artifactId>
+      <version>1.0</version>
+    </dependency>
     <dependency>
       <groupId>${groupId}</groupId>
       <artifactId>maven-agent</artifactId>

core/src/main/java/hudson/scm/SubversionSCM.java

@@ -30,6 +30,7 @@ import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.Chmod;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.putty.PuTTYKey;
 import org.tmatesoft.svn.core.SVNDirEntry;
 import org.tmatesoft.svn.core.SVNErrorCode;
 import org.tmatesoft.svn.core.SVNErrorMessage;
@@ -1049,12 +1050,18 @@ public class SubversionSCM extends SCM implements Serializable {
             } else {
                 item = parser.getFileItem(kind.equals("publickey")?"privateKey":"certificate");
                 keyFile = File.createTempFile("hudson","key");
-                if(item!=null)
+                if(item!=null) {
                     try {
                         item.write(keyFile);
                     } catch (Exception e) {
                         throw new IOException2(e);
                     }
+                    if(PuTTYKey.isPuTTYKeyFile(keyFile)) {
+                        // TODO: we need a passphrase support
+                        LOGGER.info("Converting "+keyFile+" from PuTTY format to OpenSSH format");
+                        new PuTTYKey(keyFile,null).toOpenSSH(keyFile);
+                    }
+                }
             }
 
             SVNRepository repository = null;