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

diff --git a/src/core/sslserver.h b/src/core/sslserver.h
index 1f43cc43..61cc2223 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,29 +18,29 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef SSLSERVER_H
-#define SSLSERVER_H
+#pragma once
 
 #ifdef HAVE_SSL
 
-#include <QSslCertificate>
-#include <QSslKey>
-#include <QTcpServer>
-#include <QLinkedList>
+#    include <QFile>
+#    include <QLinkedList>
+#    include <QSslCertificate>
+#    include <QSslKey>
+#    include <QTcpServer>
 
 class SslServer : public QTcpServer
 {
     Q_OBJECT
 
 public:
-    SslServer(QObject *parent = 0);
+    SslServer(QObject* parent = nullptr);
 
-    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
@@ -53,13 +53,9 @@ public:
     bool reloadCerts();
 
 protected:
-#if QT_VERSION >= 0x050000
-    virtual void incomingConnection(qintptr socketDescriptor);
-#else
-    virtual void incomingConnection(int socketDescriptor);
-#endif
+    void incomingConnection(qintptr socketDescriptor) override;
 
-    virtual bool setCertificate(const QString &path, const QString &keyPath);
+    bool setCertificate(const QString& path, const QString& keyPath);
 
 private:
     /**
@@ -71,19 +67,17 @@ private:
      * @return True if certificates loaded successfully, otherwise false.
      */
     bool loadCerts();
+    QSslKey loadKey(QFile* keyFile);
 
-    QLinkedList<QTcpSocket *> _pendingConnections;
+    QLinkedList<QTcpSocket*> _pendingConnections;
     QSslCertificate _cert;
     QSslKey _key;
     QList<QSslCertificate> _ca;
-    bool _isCertValid;
+    bool _isCertValid{false};
 
     // Used when reloading certificates later
-    QString _sslCertPath; /// Path to the certificate file
-    QString _sslKeyPath;  /// Path to the private key file (may be in same file as above)
+    QString _sslCertPath;  /// Path to the certificate file
+    QString _sslKeyPath;   /// Path to the private key file (may be in same file as above)
 };
 
-
-#endif //HAVE_SSL
-
-#endif //SSLSERVER_H
+#endif  // HAVE_SSL