Home
Reading
Searching
Subscribe
Sponsors
Statistics
Posting
Contact
Spam
Lists
Links
About
Hosting
Filtering
Features Download
Marketing
Archives
FAQ
Blog
 
Gmane
From: X2Go dev team <git-admin-P0WSJaAXTow <at> public.gmane.org>
Subject: x2goclient.git - master (branch) updated: 4.0.0.0-4-g2204400
Newsgroups: gmane.linux.terminal-server.x2go.scm
Date: Wednesday 16th January 2013 13:10:51 UTC (over 3 years ago)
The branch, master has been updated
       via  2204400df14c96319fb54f84ad05f23946a4be35 (commit)
      from  b7bfb4baa723b10ef23f75034cc8dd95287a8faf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2204400df14c96319fb54f84ad05f23946a4be35
Author: Oleksandr Shneyder

Date:   Wed Jan 16 14:10:44 2013 +0100

    fixed support for RSA Keys in X2Go Broker code

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog     |    4 ++++
 httpbrokerclient.cpp |   11 +++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 696fd8d..4f97ed6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 x2goclient (4.0.1.0-0~x2go1) UNRELEASED; urgency=low
 
+  [ Mike Gabriel ]
   * New upstream version (4.0.1.0):
     - Continue development...
 
+  [ Oleksandr Shneyder ]
+  * fixed support for RSA Keys in X2Go Broker code
+
  -- Mike Gabriel
  Sun, 30
Dec 2012 15:41:04 +0100
 
 x2goclient (4.0.0.1-0~x2go1) unstable; urgency=low
diff --git a/httpbrokerclient.cpp b/httpbrokerclient.cpp
index f473a96..fe6d89f 100644
--- a/httpbrokerclient.cpp
+++ b/httpbrokerclient.cpp
@@ -250,7 +250,7 @@ void HttpBrokerClient::getUserSessions()
 
 void HttpBrokerClient::selectUserSession(const QString& session)
 {
-      QString brokerUser=config->brokerUser;
+    QString brokerUser=config->brokerUser;
     if(mainWindow->getUsePGPCard())
         brokerUser=mainWindow->getCardLogin();
 
@@ -279,7 +279,7 @@ void HttpBrokerClient::selectUserSession(const QString&
session)
 void HttpBrokerClient::changePassword(QString newPass)
 {
     newBrokerPass=newPass;
-        QString brokerUser=config->brokerUser;
+    QString brokerUser=config->brokerUser;
     if(mainWindow->getUsePGPCard())
         brokerUser=mainWindow->getCardLogin();
 
@@ -460,8 +460,15 @@ void HttpBrokerClient::parseSession(QString sinfo)
     x2goDebug<<"starting parser\n";
     QStringList lst=sinfo.split("SERVER:",QString::SkipEmptyParts);
     int keyStartPos=sinfo.indexOf("-----BEGIN DSA PRIVATE KEY-----");
+    if(keyStartPos==-1)
+        keyStartPos=sinfo.indexOf("-----BEGIN RSA PRIVATE KEY-----");
     QString endStr="-----END DSA PRIVATE KEY-----";
     int keyEndPos=sinfo.indexOf(endStr);
+    if(keyEndPos==-1)
+    {
+        endStr="-----END RSA PRIVATE KEY-----";
+        keyEndPos=sinfo.indexOf(endStr);
+    }
     if (! (keyEndPos == -1 || keyStartPos == -1 || lst.size()==0))
         config->key=sinfo.mid(keyStartPos,
keyEndPos+endStr.length()-keyStartPos);
     QString serverLine=(lst[1].split("\n"))[0];


hooks/post-receive
 
CD: 11ms