Reset certFile instead of reopening in SslServer::setCertificate.

[quassel.git] / src / core / sslserver.cpp

diff --git a/src/core/sslserver.cpp b/src/core/sslserver.cpp
index 203ec76..7fee3ca 100644 (file)
--- a/src/core/sslserver.cpp
+++ b/src/core/sslserver.cpp
@@ -60,20 +60,31 @@ void SslServer::incomingConnection(int socketDescriptor) {
 }
 
 bool SslServer::setCertificate(const QString &path) {
+  _certIsValid = false;
+
+  if (path.isNull()) {
+    return false;
+  }
+
   QFile certFile(path);
+  if (! certFile.exists()) {
+    qWarning() << "SslServer: Certificate file" << qPrintable(path) << "does not exist";
+    return false;
+  }
+
   certFile.open(QIODevice::ReadOnly);
   _cert = QSslCertificate(&certFile);
-  certFile.close();
 
-  certFile.open(QIODevice::ReadOnly);
+  certFile.reset();
   _key = QSslKey(&certFile, QSsl::Rsa);
   certFile.close();
 
-  _certIsValid = !_cert.isNull() && _cert.isValid() && !_key.isNull();
-  if(!_certIsValid) {
+  if(_cert.isNull() || !_cert.isValid() || _key.isNull()) {
     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.";
+  } else {
+    _certIsValid = true;
   }
 
   return _certIsValid;