Merge pull request #1160 from hbons/key_types
fetcher: look for other host keys, not just RSA
This commit is contained in:
commit
459e492dce
|
@ -270,21 +270,25 @@ namespace SparkleLib {
|
||||||
process.StartInfo.CreateNoWindow = true;
|
process.StartInfo.CreateNoWindow = true;
|
||||||
process.EnableRaisingEvents = true;
|
process.EnableRaisingEvents = true;
|
||||||
|
|
||||||
if (RemoteUrl.Port < 1)
|
string [] key_types = {"rsa", "dsa", "ecdsa"};
|
||||||
process.StartInfo.Arguments = "-t rsa -p 22 " + RemoteUrl.Host;
|
|
||||||
else
|
|
||||||
process.StartInfo.Arguments = "-t rsa -p " + RemoteUrl.Port + " " + RemoteUrl.Host;
|
|
||||||
|
|
||||||
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 ();
|
SparkleLogger.LogInfo ("Cmd", process.StartInfo.FileName + " " + process.StartInfo.Arguments);
|
||||||
string host_key = process.StandardOutput.ReadToEnd ().Trim ();
|
|
||||||
process.WaitForExit ();
|
|
||||||
|
|
||||||
if (process.ExitCode == 0 && !string.IsNullOrEmpty (host_key))
|
process.Start ();
|
||||||
return host_key;
|
string host_key = process.StandardOutput.ReadToEnd ().Trim ();
|
||||||
else
|
process.WaitForExit ();
|
||||||
return null;
|
|
||||||
|
if (process.ExitCode == 0 && !string.IsNullOrWhiteSpace (host_key))
|
||||||
|
return host_key;
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue