From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Tue, 17 Jun 2008 10:46:19 +0000 (+0200)
Subject: Revert "Allow user to provide a key/certificate pair for outgoing IRC connections."
X-Git-Tag: 0.2.0-rc1~55
X-Git-Url: https://git.quassel-irc.org/?a=commitdiff_plain;h=21d45dff3595e630e2c4ebce453fe53271fa609d;p=quassel.git

Revert "Allow user to provide a key/certificate pair for outgoing IRC connections."

New feature should not go into 0.2 (which is in feature freeze). Plus it's problematic
because it doesn't work in a multiuser environment. Need to think this through first.

This reverts commit b28143aec8a66798a80ea77bc5838dd558468a99.
---

diff --git a/src/core/networkconnection.cpp b/src/core/networkconnection.cpp
index 02bd2592..97c573a8 100644
--- a/src/core/networkconnection.cpp
+++ b/src/core/networkconnection.cpp
@@ -86,23 +86,6 @@ NetworkConnection::NetworkConnection(Network *network, CoreSession *session)
   connect(network, SIGNAL(autoReconnectRetriesSet(quint16)), this, SLOT(autoReconnectSettingsChanged()));
 
 #ifndef QT_NO_OPENSSL
-  {
-    QFile certFile(quasselDir().absolutePath() + "/quasselClientCert.pem");
-    certFile.open(QIODevice::ReadOnly);
-    QSslCertificate cert(&certFile);
-    certFile.close();
-
-    certFile.open(QIODevice::ReadOnly);
-    QSslKey key(&certFile, QSsl::Rsa);
-    certFile.close();
-
-    if ( !cert.isNull() && cert.isValid() &&
-	 !key.isNull() ) {
-      socket.setLocalCertificate(cert);
-      socket.setPrivateKey(key);
-    }
-  }
-
   connect(&socket, SIGNAL(encrypted()), this, SLOT(socketEncrypted()));
   connect(&socket, SIGNAL(sslErrors(const QList<QSslError> &)), this, SLOT(sslErrors(const QList<QSslError> &)));
 #endif