X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fstorage.h;h=87e9b8421e0019df3469af0df050f8bd22bfe726;hp=989f33142e18e63de06795d7491ff8391ff67c63;hb=e67887343c433cc35bc26ad6a9392588f427e746;hpb=1e57394b3bb6aaf6213270658e00975b19f02d26 diff --git a/src/core/storage.h b/src/core/storage.h index 989f3314..87e9b842 100644 --- a/src/core/storage.h +++ b/src/core/storage.h @@ -43,13 +43,10 @@ public: }; enum HashVersion { - sha1, -#if QT_VERSION >= 0x050000 - sha2_512, - latest=sha2_512 -#else - latest=sha1 -#endif + Sha1, + Sha2_512, + Latest=Sha2_512 + }; 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); };