X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fsslserver.h;h=9b69a8c56f2ee7093d979a240d3077c0bdc3e6a6;hp=fdbecbf29104ca5f3725fbe87b4eb693f1c3afce;hb=56d25331d61b4b24a2805f1cf16e68f722fdaf73;hpb=f9c4125d5da21eac006eaa2558f87705ddefff4f

diff --git a/src/core/sslserver.h b/src/core/sslserver.h
index fdbecbf2..9b69a8c5 100644
--- a/src/core/sslserver.h
+++ b/src/core/sslserver.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-2015 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,44 +15,51 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #ifndef SSLSERVER_H
 #define SSLSERVER_H
 
-#ifndef QT_NO_OPENSSL
-#  include <QSslCertificate>
-#  include <QSslKey>
+#ifdef HAVE_SSL
+
+#include <QSslCertificate>
+#include <QSslKey>
 #include <QTcpServer>
 #include <QLinkedList>
-#endif
-
-#ifndef QT_NO_OPENSSL
 
-class SslServer : public QTcpServer {
-  Q_OBJECT
+class SslServer : public QTcpServer
+{
+    Q_OBJECT
 
 public:
-  SslServer(QObject *parent = 0);
+    SslServer(QObject *parent = 0);
 
-  virtual inline bool hasPendingConnections() const { return !_pendingConnections.isEmpty(); }
-  virtual QTcpSocket *nextPendingConnection();
+    virtual inline bool hasPendingConnections() const { return !_pendingConnections.isEmpty(); }
+    virtual QTcpSocket *nextPendingConnection();
 
-  virtual inline const QSslCertificate &certificate() const { return _cert; }
-  virtual inline const QSslKey &key() const { return _key; }
-  virtual inline bool certIsValid() const { return _certIsValid; }
+    virtual inline const QSslCertificate &certificate() const { return _cert; }
+    virtual inline const QSslKey &key() const { return _key; }
+    virtual inline bool isCertValid() const { return _isCertValid; }
 
 protected:
-  virtual void incomingConnection(int socketDescriptor);
+#if QT_VERSION >= 0x050000
+    virtual void incomingConnection(qintptr socketDescriptor);
+#else
+    virtual void incomingConnection(int socketDescriptor);
+#endif
+
+    virtual bool setCertificate(const QString &path, const QString &keyPath);
 
 private:
-  QLinkedList<QTcpSocket *> _pendingConnections;
-  QSslCertificate _cert;
-  QSslKey _key;
-  bool _certIsValid;
+    QLinkedList<QTcpSocket *> _pendingConnections;
+    QSslCertificate _cert;
+    QSslKey _key;
+    QList<QSslCertificate> _ca;
+    bool _isCertValid;
 };
 
-#endif //QT_NO_OPENSSL
+
+#endif //HAVE_SSL
 
 #endif //SSLSERVER_H