projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a flag to enable Qt deprecation warnings on Qt < 5.13
[quassel.git]
/
src
/
core
/
sslserver.cpp
diff --git
a/src/core/sslserver.cpp
b/src/core/sslserver.cpp
index
d3b6070
..
16e3f3e
100644
(file)
--- a/
src/core/sslserver.cpp
+++ b/
src/core/sslserver.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
8
by the Quassel Project *
+ * Copyright (C) 2005-201
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 *
@@
-26,6
+26,7
@@
#include <QDateTime>
#include <QDateTime>
+#include "core.h"
#include "quassel.h"
#ifdef HAVE_SSL
#include "quassel.h"
#ifdef HAVE_SSL
@@
-199,6
+200,11
@@
bool SslServer::setCertificate(const QString& path, const QString& keyPath)
return false;
}
return false;
}
+ _certificateExpires = untestedCert.expiryDate();
+ if (_metricsServer) {
+ _metricsServer->setCertificateExpires(_certificateExpires);
+ }
+
_isCertValid = true;
// All keys are valid, update the externally visible copy used for new connections.
_isCertValid = true;
// All keys are valid, update the externally visible copy used for new connections.
@@
-223,4
+229,11
@@
QSslKey SslServer::loadKey(QFile* keyFile)
return key;
}
return key;
}
+void SslServer::setMetricsServer(MetricsServer* metricsServer) {
+ _metricsServer = metricsServer;
+ if (_metricsServer) {
+ _metricsServer->setCertificateExpires(_certificateExpires);
+ }
+}
+
#endif // HAVE_SSL
#endif // HAVE_SSL