X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcoreidentity.cpp;h=b7cd6d09c34d737397bcaf511744dba66c7070fb;hb=cdc6091a2e02b84a48937cda287a0769ceb8726a;hp=8e6fc596428363dc9bd0f550331fc5d8d0bd29fc;hpb=76db8cdfbeffaaba359c8e80cf2146da9e9e7f8a;p=quassel.git diff --git a/src/core/coreidentity.cpp b/src/core/coreidentity.cpp index 8e6fc596..b7cd6d09 100644 --- a/src/core/coreidentity.cpp +++ b/src/core/coreidentity.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 * @@ -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);