X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fstorage.cpp;h=4b56573220e17a241c935c3c0690198e51237ae0;hp=f8d60b76709a9f1b476f88e70d8ad1b3fe4f5dc5;hb=32c0bb666209932d7540c22ddc393fd4550d5418;hpb=1e57394b3bb6aaf6213270658e00975b19f02d26

diff --git a/src/core/storage.cpp b/src/core/storage.cpp
index f8d60b76..4b565732 100644
--- a/src/core/storage.cpp
+++ b/src/core/storage.cpp
@@ -21,6 +21,11 @@
 #include "storage.h"
 
 #include <QCryptographicHash>
+#include <random>
+
+#if QT_VERSION < 0x050000
+#    include "../../3rdparty/sha512/sha512.h"
+#endif
 
 Storage::Storage(QObject *parent)
     : QObject(parent)
@@ -29,11 +34,7 @@ Storage::Storage(QObject *parent)
 
 QString Storage::hashPassword(const QString &password)
 {
-#if QT_VERSION >= 0x050000
     return hashPasswordSha2_512(password);
-#else
-    return hashPasswordSha1(password);
-#endif
 }
 
 bool Storage::checkHashedPassword(const UserId user, const QString &password, const QString &hashedPassword, const Storage::HashVersion version)
@@ -41,21 +42,19 @@ bool Storage::checkHashedPassword(const UserId user, const QString &password, co
     bool passwordCorrect = false;
     
     switch (version) {
-    case Storage::HashVersion::sha1:
+    case Storage::HashVersion::Sha1:
         passwordCorrect = checkHashedPasswordSha1(password, hashedPassword);
         break;
 
-#if QT_VERSION >= 0x050000
-    case Storage::HashVersion::sha2_512:
+    case Storage::HashVersion::Sha2_512:
         passwordCorrect = checkHashedPasswordSha2_512(password, hashedPassword);
         break;
-#endif
 
     default:
         qWarning() << "Password hash version" << QString(version) << "is not supported, please reset password";
     }
     
-    if (passwordCorrect && version < Storage::HashVersion::latest) {
+    if (passwordCorrect && version < Storage::HashVersion::Latest) {
         updateUser(user, password);
     }
     
@@ -72,7 +71,6 @@ bool Storage::checkHashedPasswordSha1(const QString &password, const QString &ha
     return hashPasswordSha1(password) == hashedPassword;
 }
 
-#if QT_VERSION >= 0x050000
 QString Storage::hashPasswordSha2_512(const QString &password)
 {
     // Generate a salt of 512 bits (64 bytes) using the Mersenne Twister
@@ -86,11 +84,8 @@ QString Storage::hashPasswordSha2_512(const QString &password)
     }
     QString salt(saltBytes.toHex());
 
-    // Append the salt to the password and hash it
-    QString passwordAndSalt(password + salt);
-    QString hash(QCryptographicHash::hash(passwordAndSalt.toUtf8(), QCryptographicHash::Sha512).toHex());
-
-    return hash + ":" + salt;
+    // Append the salt to the password, hash the result, and append the salt value
+    return sha2_512(password + salt) + ":" + salt;
 }
 
 bool Storage::checkHashedPasswordSha2_512(const QString &password, const QString &hashedPassword)
@@ -99,12 +94,22 @@ bool Storage::checkHashedPasswordSha2_512(const QString &password, const QString
     QStringList hashedPasswordAndSalt = hashedPassword.split(colonSplitter);
 
     if (hashedPasswordAndSalt.size() == 2){
-        QString passwordAndSalt(password + hashedPasswordAndSalt[1]);
-        return QString(QCryptographicHash::hash(passwordAndSalt.toUtf8(), QCryptographicHash::Sha512).toHex()) == hashedPasswordAndSalt[0];
+        return sha2_512(password + hashedPasswordAndSalt[1]) == hashedPasswordAndSalt[0];
     }
     else {
         qWarning() << "Password hash and salt were not in the correct format";
         return false;
     }
 }
+
+QString Storage::sha2_512(const QString &input)
+{
+#if QT_VERSION >= 0x050000
+    return QString(QCryptographicHash::hash(input.toUtf8(), QCryptographicHash::Sha512).toHex());
+#else
+    QByteArray inputBytes = input.toUtf8();
+    unsigned char output[64];
+    sha512((unsigned char*) inputBytes.constData(), inputBytes.size(), output, false);
+    return QString(QByteArray::fromRawData((char*) output, 64).toHex());
 #endif
+}