beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fetcher: look for other host keys, not just RSA

Browse source
This commit is contained in:
Hylke Bons 2013-01-23 12:07:52 +00:00
parent 295b01a75a
commit 5efc5d07d3
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
SparkleLib/SparkleFetcherBase.cs
View file

@ -270,21 +270,25 @@ namespace SparkleLib {
process.StartInfo.CreateNoWindow = true;
process.EnableRaisingEvents = true;
if (RemoteUrl.Port < 1)
process.StartInfo.Arguments = "-t rsa -p 22 " + RemoteUrl.Host;
else
process.StartInfo.Arguments = "-t rsa -p " + RemoteUrl.Port + " " + RemoteUrl.Host;
string [] key_types = {"rsa", "dsa", "ecdsa"};
SparkleLogger.LogInfo ("Cmd", process.StartInfo.FileName + " " + process.StartInfo.Arguments);
foreach (string key_type in key_types) {
if (RemoteUrl.Port < 1)
process.StartInfo.Arguments = "-t " + key_type + " -p 22 " + RemoteUrl.Host;
else
process.StartInfo.Arguments = "-t " + key_type + " -p " + RemoteUrl.Port + " " + RemoteUrl.Host;
process.Start ();
string host_key = process.StandardOutput.ReadToEnd ().Trim ();
process.WaitForExit ();
SparkleLogger.LogInfo ("Cmd", process.StartInfo.FileName + " " + process.StartInfo.Arguments);
if (process.ExitCode == 0 && !string.IsNullOrEmpty (host_key))
return host_key;
else
return null;
process.Start ();
string host_key = process.StandardOutput.ReadToEnd ().Trim ();
process.WaitForExit ();
if (process.ExitCode == 0 && !string.IsNullOrWhiteSpace (host_key))
return host_key;
}
return null;
}