projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
ffcc8be
)
More obvious logic in SslServer::setCertificate.
author
Joshua T Corbin
<jcorbin@wunjo.org>
Thu, 8 Jan 2009 23:52:54 +0000
(18:52 -0500)
committer
Manuel Nickschas
<sputnick@quassel-irc.org>
Fri, 16 Jan 2009 19:47:10 +0000
(20:47 +0100)
src/core/sslserver.cpp
patch
|
blob
|
history
diff --git
a/src/core/sslserver.cpp
b/src/core/sslserver.cpp
index
203ec76
..
570957d
100644
(file)
--- a/
src/core/sslserver.cpp
+++ b/
src/core/sslserver.cpp
@@
-60,6
+60,8
@@
void SslServer::incomingConnection(int socketDescriptor) {
}
bool SslServer::setCertificate(const QString &path) {
}
bool SslServer::setCertificate(const QString &path) {
+ _certIsValid = false;
+
QFile certFile(path);
certFile.open(QIODevice::ReadOnly);
_cert = QSslCertificate(&certFile);
QFile certFile(path);
certFile.open(QIODevice::ReadOnly);
_cert = QSslCertificate(&certFile);
@@
-69,11
+71,12
@@
bool SslServer::setCertificate(const QString &path) {
_key = QSslKey(&certFile, QSsl::Rsa);
certFile.close();
_key = QSslKey(&certFile, QSsl::Rsa);
certFile.close();
- _certIsValid = !_cert.isNull() && _cert.isValid() && !_key.isNull();
- if(!_certIsValid) {
+ if(_cert.isNull() || !_cert.isValid() || _key.isNull()) {
qWarning() << "SslServer: SSL Certificate is either missing or has a wrong format!\n"
<< " Quassel Core will still work, but cannot provide SSL for client connections.\n"
<< " Please see http://quassel-irc.org/faq/cert to learn how to enable SSL support.";
qWarning() << "SslServer: SSL Certificate is either missing or has a wrong format!\n"
<< " Quassel Core will still work, but cannot provide SSL for client connections.\n"
<< " Please see http://quassel-irc.org/faq/cert to learn how to enable SSL support.";
+ } else {
+ _certIsValid = true;
}
return _certIsValid;
}
return _certIsValid;