X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fclientidentity.cpp;h=3507a10b7d5b3efd3e6d20ff5b80ec9f70692258;hb=48dda5f3e963e13e36300ddaef262660bf169672;hp=0879e9b335180c572feceb0c7faf562257bc71c9;hpb=0a43227b8cd44625f4881cc1545d42c8c8a4876c;p=quassel.git

diff --git a/src/client/clientidentity.cpp b/src/client/clientidentity.cpp
index 0879e9b3..3507a10b 100644
--- a/src/client/clientidentity.cpp
+++ b/src/client/clientidentity.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2016 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);