X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fstorage.h;h=71492d5b8f92e255340e4e66f0063cc8e73be77e;hb=ccd09eb6ca7377f51d57c546f99c9b1c30ef97c1;hp=9b9ce4f04e921e1e4986936970eb963373e5dded;hpb=d8b10ef03c8edcec9e81ee126fd5a83e350b1571;p=quassel.git diff --git a/src/core/storage.h b/src/core/storage.h index 9b9ce4f0..71492d5b 100644 --- a/src/core/storage.h +++ b/src/core/storage.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2015 by the Quassel Project * + * Copyright (C) 2005-2016 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -44,12 +44,9 @@ public: enum HashVersion { Sha1, -#if QT_VERSION >= 0x050000 Sha2_512, Latest=Sha2_512 -#else - Latest=Sha1 -#endif + }; public slots: @@ -425,10 +422,9 @@ private: QString hashPasswordSha1(const QString &password); bool checkHashedPasswordSha1(const QString &password, const QString &hashedPassword); -#if QT_VERSION >= 0x050000 QString hashPasswordSha2_512(const QString &password); bool checkHashedPasswordSha2_512(const QString &password, const QString &hashedPassword); -#endif + QString sha2_512(const QString &input); };