X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fstorage.cpp;h=34432d1acaf2b3e5b151c95202843dd60fd09d71;hp=92892563d26e734381880ecbc3c7cba87f374a31;hb=a95ad2de573027f9bee36db972bcae4195168d0c;hpb=ab7ef4d24f62b5848b628482b7762ebfc0b53e1a

diff --git a/src/core/storage.cpp b/src/core/storage.cpp
index 92892563..34432d1a 100644
--- a/src/core/storage.cpp
+++ b/src/core/storage.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2018 by the Quassel Project                        *
+ *   Copyright (C) 2005-2020 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -24,17 +24,16 @@
 
 #include <QCryptographicHash>
 
-Storage::Storage(QObject *parent)
+Storage::Storage(QObject* parent)
     : QObject(parent)
-{
-}
+{}
 
-QString Storage::hashPassword(const QString &password)
+QString Storage::hashPassword(const QString& password)
 {
     return hashPasswordSha2_512(password);
 }
 
-bool Storage::checkHashedPassword(const UserId user, const QString &password, const QString &hashedPassword, const Storage::HashVersion version)
+bool Storage::checkHashedPassword(const UserId user, const QString& password, const QString& hashedPassword, const Storage::HashVersion version)
 {
     bool passwordCorrect = false;
 
@@ -58,17 +57,17 @@ bool Storage::checkHashedPassword(const UserId user, const QString &password, co
     return passwordCorrect;
 }
 
-QString Storage::hashPasswordSha1(const QString &password)
+QString Storage::hashPasswordSha1(const QString& password)
 {
     return QString(QCryptographicHash::hash(password.toUtf8(), QCryptographicHash::Sha1).toHex());
 }
 
-bool Storage::checkHashedPasswordSha1(const QString &password, const QString &hashedPassword)
+bool Storage::checkHashedPasswordSha1(const QString& password, const QString& hashedPassword)
 {
     return hashPasswordSha1(password) == hashedPassword;
 }
 
-QString Storage::hashPasswordSha2_512(const QString &password)
+QString Storage::hashPasswordSha2_512(const QString& password)
 {
     // Generate a salt of 512 bits (64 bytes) using the Mersenne Twister
     std::random_device seed;
@@ -77,7 +76,7 @@ QString Storage::hashPasswordSha2_512(const QString &password)
     QByteArray saltBytes;
     saltBytes.resize(64);
     for (int i = 0; i < 64; i++) {
-        saltBytes[i] = (unsigned char) distribution(generator);
+        saltBytes[i] = (unsigned char)distribution(generator);
     }
     QString salt(saltBytes.toHex());
 
@@ -85,12 +84,12 @@ QString Storage::hashPasswordSha2_512(const QString &password)
     return sha2_512(password + salt) + ":" + salt;
 }
 
-bool Storage::checkHashedPasswordSha2_512(const QString &password, const QString &hashedPassword)
+bool Storage::checkHashedPasswordSha2_512(const QString& password, const QString& hashedPassword)
 {
     QRegExp colonSplitter("\\:");
     QStringList hashedPasswordAndSalt = hashedPassword.split(colonSplitter);
 
-    if (hashedPasswordAndSalt.size() == 2){
+    if (hashedPasswordAndSalt.size() == 2) {
         return sha2_512(password + hashedPasswordAndSalt[1]) == hashedPasswordAndSalt[0];
     }
     else {
@@ -99,7 +98,7 @@ bool Storage::checkHashedPasswordSha2_512(const QString &password, const QString
     }
 }
 
-QString Storage::sha2_512(const QString &input)
+QString Storage::sha2_512(const QString& input)
 {
     return QString(QCryptographicHash::hash(input.toUtf8(), QCryptographicHash::Sha512).toHex());
 }