From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Tue, 17 Jun 2008 11:52:45 +0000 (+0200)
Subject: Revert "Allow user to provide a key/certificate pair for outgoing IRC connections."
X-Git-Tag: 0.3.0~373
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=546e609b7e2fa683e8b7b90d6079dd3a80ed4c6b;hp=4d51726933e9ac2a5a335a23f957c7c75ead0be8

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

This implementation uses one cert for all users, which is not correct.
Reverting this until we have found a sane solution to allow key-based auth
in a multi-user setting.

This reverts commit e91445dfdb33704e5daafa8631bc9a1419251c1c.
---

diff --git a/src/core/networkconnection.cpp b/src/core/networkconnection.cpp
index c74dc4ef..3d9fcc73 100644
--- a/src/core/networkconnection.cpp
+++ b/src/core/networkconnection.cpp
@@ -91,23 +91,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