X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fsslserver.cpp;h=203ec76115292f20da937ab744b1f21cece513a3;hp=b007a65f4f58c59c2e6135a04080a6df9b97098f;hb=ffcc8befd931340321e3aa2029cb5667373fd584;hpb=3d5ff3b49a93a3f375b6b454088caafec751dfb6

diff --git a/src/core/sslserver.cpp b/src/core/sslserver.cpp
index b007a65f..203ec761 100644
--- a/src/core/sslserver.cpp
+++ b/src/core/sslserver.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -20,30 +20,22 @@
 
 #include "sslserver.h"
 
-#include <QSslSocket>
+#ifdef HAVE_SSL
+#  include <QSslSocket>
+#endif
+
 #include <QFile>
 #include <QDebug>
 
+#include "logger.h"
 #include "util.h"
 
+#ifdef HAVE_SSL
+
 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 wrong format!";
-    qWarning() << "           make sure that ~/.quassel/quasselCert.pem is pem format and contains the cert and an rsa key!";
-    qWarning() << "SslServer: this Quassel Core cannot provide SSL!";
-  }
+  setCertificate(quasselDir().absolutePath() + "/quasselCert.pem");
 }
 
 QTcpSocket *SslServer::nextPendingConnection() {
@@ -66,3 +58,25 @@ void SslServer::incomingConnection(int socketDescriptor) {
     delete serverSocket;
   }
 }
+
+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