File keys.diff of Package mingw32-x2goclient
ssh-keygen is called with -t rsa, so make damn sure that
we also use the rsa key everywhere else.
---
src/onmainwindow.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
Index: x2goclient-4.0.5.2/src/onmainwindow.cpp
===================================================================
--- x2goclient-4.0.5.2.orig/src/onmainwindow.cpp
+++ x2goclient-4.0.5.2/src/onmainwindow.cpp
@@ -8051,10 +8051,10 @@ QString ONMainWindow::createRSAKey()
#ifdef Q_OS_WIN
rsa.setFileName (
wapiShortFileName (
- homeDir+"\\.x2go\\etc\\ssh_host_dsa_key.pub" ) );
+ homeDir+"\\.x2go\\etc\\ssh_host_rsa_key.pub" ) );
#else
if ( userSshd )
- rsa.setFileName ( homeDir+"/.x2go/etc/ssh_host_dsa_key.pub" );
+ rsa.setFileName ( homeDir+"/.x2go/etc/ssh_host_rsa_key.pub" );
#endif
@@ -10415,7 +10415,7 @@ bool ONMainWindow::startSshd()
std::string clientdir=wapiShortFileName ( appDir ).toStdString();
std::stringstream strm;
std::string config="\""+cygwinPath(etcDir+"/sshd_config").toStdString()+"\"";
- std::string key="\""+cygwinPath(etcDir+"/ssh_host_dsa_key").toStdString()+"\"";
+ std::string key="\""+cygwinPath(etcDir+"/ssh_host_rsa_key").toStdString()+"\"";
// generate a unique sshLog filepath, and create its directory
if (debugging)
@@ -10491,7 +10491,7 @@ bool ONMainWindow::startSshd()
QStringList arguments;
arguments<<"-f"<<etcDir +"/sshd_config"<< "-h" <<
- etcDir+"/ssh_host_dsa_key"<<"-D"<<"-p"<<clientSshPort;
+ etcDir+"/ssh_host_rsa_key"<<"-D"<<"-p"<<clientSshPort;
sshd->start (binary, arguments);
#endif // defined (Q_OS_WIN)