X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientidentity.cpp;fp=src%2Fclient%2Fclientidentity.cpp;h=08a24b7f922e827866e124251d40823b9028d804;hp=3507a10b7d5b3efd3e6d20ff5b80ec9f70692258;hb=ab7ef4d24f62b5848b628482b7762ebfc0b53e1a;hpb=c55df5f2d765b100b7a1ead5a72202f969aa9581 diff --git a/src/client/clientidentity.cpp b/src/client/clientidentity.cpp index 3507a10b..08a24b7f 100644 --- a/src/client/clientidentity.cpp +++ b/src/client/clientidentity.cpp @@ -111,10 +111,8 @@ void CertIdentity::markClean() void ClientCertManager::setSslKey(const QByteArray &encoded) { QSslKey key(encoded, QSsl::Rsa); -#if QT_VERSION >= 0x050500 if (key.isNull() && Client::isCoreFeatureEnabled(Quassel::Feature::EcdsaCertfpKeys)) key = QSslKey(encoded, QSsl::Ec); -#endif if (key.isNull()) key = QSslKey(encoded, QSsl::Dsa); _certIdentity->setSslKey(key); @@ -126,5 +124,4 @@ void ClientCertManager::setSslCert(const QByteArray &encoded) _certIdentity->setSslCert(QSslCertificate(encoded)); } - #endif // HAVE_SSL