X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fsslserver.h;h=d0efde21d01d9ed81c11f73ef5a5de4a7ef42147;hp=fdbecbf29104ca5f3725fbe87b4eb693f1c3afce;hb=a5455d1ea8785e864ce4b513e63283ed156d4872;hpb=a14eac175cceda16f50cb4519182f819cf7f6b23

diff --git a/src/core/sslserver.h b/src/core/sslserver.h
index fdbecbf2..d0efde21 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-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -21,14 +21,12 @@
 #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
@@ -41,18 +39,20 @@ public:
 
   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 bool isCertValid() const { return _isCertValid; }
 
 protected:
   virtual void incomingConnection(int socketDescriptor);
+  virtual bool setCertificate(const QString &path);
 
 private:
   QLinkedList<QTcpSocket *> _pendingConnections;
   QSslCertificate _cert;
   QSslKey _key;
-  bool _certIsValid;
+  QList<QSslCertificate> _ca;
+  bool _isCertValid;
 };
 
-#endif //QT_NO_OPENSSL
+#endif //HAVE_SSL
 
 #endif //SSLSERVER_H