Separate certificate setting into a method.

Move SSL certificate setting logic from SslServer::SslServer
to SslServer::setCertificate.

diff --git a/src/core/sslserver.cpp b/src/core/sslserver.cpp
index 46b8ee6..203ec76 100644 (file)
--- a/src/core/sslserver.cpp
+++ b/src/core/sslserver.cpp
@@ -35,21 +35,7 @@
 SslServer::SslServer(QObject *parent)
   : QTcpServer(parent)
 {
-  QFile certFile(quasselDir().absolutePath() + "/quasselCert.pem");
-  certFile.open(QIODevice::ReadOnly);
-  _cert = QSslCertificate(&certFile);
-  certFile.close();
-
-  certFile.open(QIODevice::ReadOnly);
-  _key = QSslKey(&certFile, QSsl::Rsa);
-  certFile.close();
-
-  _certIsValid = !_cert.isNull() && _cert.isValid() && !_key.isNull();
-  if(!_certIsValid) {
-    qWarning() << "SslServer: SSL Certificate is either missing or has a wrong format!\n"
-               << "          Quassel Core will still work, but cannot provide SSL for client connections.\n"
-               << "          Please see http://quassel-irc.org/faq/cert to learn how to enable SSL support.";
-  }
+  setCertificate(quasselDir().absolutePath() + "/quasselCert.pem");
 }
 
 QTcpSocket *SslServer::nextPendingConnection() {
@@ -73,4 +59,24 @@ void SslServer::incomingConnection(int socketDescriptor) {
   }
 }
 
+bool SslServer::setCertificate(const QString &path) {
+  QFile certFile(path);
+  certFile.open(QIODevice::ReadOnly);
+  _cert = QSslCertificate(&certFile);
+  certFile.close();
+
+  certFile.open(QIODevice::ReadOnly);
+  _key = QSslKey(&certFile, QSsl::Rsa);
+  certFile.close();
+
+  _certIsValid = !_cert.isNull() && _cert.isValid() && !_key.isNull();
+  if(!_certIsValid) {
+    qWarning() << "SslServer: SSL Certificate is either missing or has a wrong format!\n"
+               << "          Quassel Core will still work, but cannot provide SSL for client connections.\n"
+               << "          Please see http://quassel-irc.org/faq/cert to learn how to enable SSL support.";
+  }
+
+  return _certIsValid;
+}
+
 #endif // HAVE_SSL

diff --git a/src/core/sslserver.h b/src/core/sslserver.h
index 1d01d28..6b5e5c8 100644 (file)
--- a/src/core/sslserver.h
+++ b/src/core/sslserver.h
@@ -43,6 +43,7 @@ public:
 
 protected:
   virtual void incomingConnection(int socketDescriptor);
+  virtual bool setCertificate(const QString &path);
 
 private:
   QLinkedList<QTcpSocket *> _pendingConnections;