X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreidentity.cpp;h=b7cd6d09c34d737397bcaf511744dba66c7070fb;hp=02c2ca4a93b9cef4266a7dab5fcf6253f8238a7a;hb=0dbec2cfc937857d66a9645249f876f1e6b3f05e;hpb=1cb02004ee5973b89368bd84f234d4652794690d diff --git a/src/core/coreidentity.cpp b/src/core/coreidentity.cpp index 02c2ca4a..b7cd6d09 100644 --- a/src/core/coreidentity.cpp +++ b/src/core/coreidentity.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2015 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 * @@ -77,6 +77,10 @@ void CoreIdentity::synchronize(SignalProxy *proxy) void CoreIdentity::setSslKey(const QByteArray &encoded) { QSslKey key(encoded, QSsl::Rsa); +#if QT_VERSION >= 0x050500 + if (key.isNull()) + key = QSslKey(encoded, QSsl::Ec); +#endif if (key.isNull()) key = QSslKey(encoded, QSsl::Dsa); setSslKey(key);