X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fsslserver.h;h=609ec77abf722ab35d2f4e2669b13dedd1c696e6;hb=cdc6091a2e02b84a48937cda287a0769ceb8726a;hp=1f43cc439e226243cd30e561d2676ebdc1d4cd77;hpb=25a3ae50ac0d9835283e4f5f10fcfcc10ed5575d;p=quassel.git

diff --git a/src/core/sslserver.h b/src/core/sslserver.h
index 1f43cc43..609ec77a 100644
--- a/src/core/sslserver.h
+++ b/src/core/sslserver.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2016 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,8 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef SSLSERVER_H
-#define SSLSERVER_H
+#pragma once
 
 #ifdef HAVE_SSL
 
@@ -27,6 +26,7 @@
 #include <QSslKey>
 #include <QTcpServer>
 #include <QLinkedList>
+#include <QFile>
 
 class SslServer : public QTcpServer
 {
@@ -35,12 +35,12 @@ class SslServer : public QTcpServer
 public:
     SslServer(QObject *parent = 0);
 
-    virtual inline bool hasPendingConnections() const { return !_pendingConnections.isEmpty(); }
-    virtual QTcpSocket *nextPendingConnection();
+    bool hasPendingConnections() const override { return !_pendingConnections.isEmpty(); }
+    QTcpSocket *nextPendingConnection() override;
 
-    virtual inline const QSslCertificate &certificate() const { return _cert; }
-    virtual inline const QSslKey &key() const { return _key; }
-    virtual inline bool isCertValid() const { return _isCertValid; }
+    const QSslCertificate &certificate() const { return _cert; }
+    const QSslKey &key() const { return _key; }
+    bool isCertValid() const { return _isCertValid; }
 
     /**
      * Reloads SSL certificates used for connections
@@ -54,12 +54,12 @@ public:
 
 protected:
 #if QT_VERSION >= 0x050000
-    virtual void incomingConnection(qintptr socketDescriptor);
+    void incomingConnection(qintptr socketDescriptor) override;
 #else
-    virtual void incomingConnection(int socketDescriptor);
+    void incomingConnection(int socketDescriptor) override;
 #endif
 
-    virtual bool setCertificate(const QString &path, const QString &keyPath);
+    bool setCertificate(const QString &path, const QString &keyPath);
 
 private:
     /**
@@ -71,6 +71,7 @@ private:
      * @return True if certificates loaded successfully, otherwise false.
      */
     bool loadCerts();
+    QSslKey loadKey(QFile *keyFile);
 
     QLinkedList<QTcpSocket *> _pendingConnections;
     QSslCertificate _cert;
@@ -85,5 +86,3 @@ private:
 
 
 #endif //HAVE_SSL
-
-#endif //SSLSERVER_H