X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientidentity.cpp;h=3507a10b7d5b3efd3e6d20ff5b80ec9f70692258;hp=eb64a12ac5a306efe2bff6d2df44ff1a41eff11c;hb=0dbec2cfc937857d66a9645249f876f1e6b3f05e;hpb=76db8cdfbeffaaba359c8e80cf2146da9e9e7f8a

diff --git a/src/client/clientidentity.cpp b/src/client/clientidentity.cpp
index eb64a12a..3507a10b 100644
--- a/src/client/clientidentity.cpp
+++ b/src/client/clientidentity.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -111,6 +111,10 @@ 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);