projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Separate certificate setting into a method.
[quassel.git]
/
src
/
core
/
sslserver.h
diff --git
a/src/core/sslserver.h
b/src/core/sslserver.h
index
fdbecbf
..
6b5e5c8
100644
(file)
--- a/
src/core/sslserver.h
+++ b/
src/core/sslserver.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-0
8
by the Quassel Project *
+ * Copyright (C) 2005-0
9
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* 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 SSLSERVER_H
#define SSLSERVER_H
-#ifndef QT_NO_OPENSSL
-# include <QSslCertificate>
-# include <QSslKey>
+#ifdef HAVE_SSL
+
+#include <QSslCertificate>
+#include <QSslKey>
#include <QTcpServer>
#include <QLinkedList>
#include <QTcpServer>
#include <QLinkedList>
-#endif
-
-#ifndef QT_NO_OPENSSL
class SslServer : public QTcpServer {
Q_OBJECT
class SslServer : public QTcpServer {
Q_OBJECT
@@
-45,6
+43,7
@@
public:
protected:
virtual void incomingConnection(int socketDescriptor);
protected:
virtual void incomingConnection(int socketDescriptor);
+ virtual bool setCertificate(const QString &path);
private:
QLinkedList<QTcpSocket *> _pendingConnections;
private:
QLinkedList<QTcpSocket *> _pendingConnections;
@@
-53,6
+52,6
@@
private:
bool _certIsValid;
};
bool _certIsValid;
};
-#endif //
QT_NO_OPEN
SSL
+#endif //
HAVE_
SSL
#endif //SSLSERVER_H
#endif //SSLSERVER_H