[X2Go-Commits] [x2goclient] 220/257: src/onmainwindow.{cpp, h}: rename generateHostKey () to generateKey () and add a boolean parameter with a default of false to request a public key.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 83a183462cc786fb59947d1470187bb53dbc525f
Author: Mihai Moldovan <io...@ionic.de>
Date:   Thu Sep 22 04:57:38 2016 +0200

    src/onmainwindow.{cpp,h}: rename generateHostKey () to generateKey () and 
add a boolean parameter with a default of false to request a public key.
    
    Change old invocations of generateHostKey () accordingly.
---
 debian/changelog     |    3 +++
 src/onmainwindow.cpp |    6 +++---
 src/onmainwindow.h   |    2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e9f12e6..5dcce76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -383,6 +383,9 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
     - src/onmainwindow.cpp: add support for explicitly setting the private key
       bit size based on type and use values (currently) regarded as secure to
       generateHostKey ().
+    - src/onmainwindow.{cpp,h}: rename generateHostKey () to generateKey ()
+      and add a boolean parameter with a default of false to request a public
+      key. Change old invocations of generateHostKey () accordingly.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.0.5.3):
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 0509dd2..831cd51 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -8174,7 +8174,7 @@ QString ONMainWindow::createRSAKey()
     if ( !rsa.open ( QIODevice::ReadOnly | QIODevice::Text ) )
     {
 #if defined (Q_OS_LINUX) || defined (Q_OS_DARWIN)
-        generateHostKey (RSA_KEY_TYPE);
+        generateKey (RSA_KEY_TYPE, true);
         generateEtcFiles ();
 
         if (!startSshd ()) {
@@ -10139,7 +10139,7 @@ void ONMainWindow::startWinServers()
     {
 
         dr.mkpath ( etcDir );
-        generateHostKey(RSA_KEY_TYPE);
+        generateKey(RSA_KEY_TYPE, true);
         generateEtcFiles();
         sshStarter->start();
     }
@@ -10316,7 +10316,7 @@ void ONMainWindow::generateEtcFiles()
     x2goDebug<<etcDir +"/sshd_config created.";
 }
 
-void ONMainWindow::generateHostKey(ONMainWindow::key_types key_type)
+void ONMainWindow::generateKey(ONMainWindow::key_types key_type, bool host_key)
 {
     ONMainWindow::key_types sanitized_key_type = UNKNOWN_KEY_TYPE;
     QString stringified_key_type = "";
diff --git a/src/onmainwindow.h b/src/onmainwindow.h
index 7430bb4..ae5d22d 100644
--- a/src/onmainwindow.h
+++ b/src/onmainwindow.h
@@ -1205,7 +1205,7 @@ private:
 #endif
     void filterDesktops ( const QString& filter,
                           bool strict=false );
-    void generateHostKey(key_types key_type);
+    void generateKey(key_types key_type, bool host_key = false);
     void generateEtcFiles();
     QString u3DataPath();
     void cleanPortable();

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits