jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-09 17:44:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed needless loop from password hashing.

Browse source
This commit is contained in:
Mark Morschhäuser 2014-03-11 19:47:52 +01:00
parent ed5f02bf7a
commit 3518f56f02
1 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

23
servatrice/src/passwordhasher.cpp
View file

@ -3,6 +3,8 @@
#include <string.h>
#include <gcrypt.h>
#define HASH_ALGO GCRY_MD_SHA512
void PasswordHasher::initialize()
{
// These calls are required by libgcrypt before we use any of its functions.
@ -13,17 +15,16 @@ void PasswordHasher::initialize()
QString PasswordHasher::computeHash(const QString &password, const QString &salt)
{
const int algo = GCRY_MD_SHA512;
const int rounds = 1000;
// concatenate salt and password
const QByteArray passwordBuffer = (salt + password).toAscii();
QByteArray passwordBuffer = (salt + password).toAscii();
int hashLen = gcry_md_get_algo_dlen(algo);
char hash[hashLen], tmp[hashLen];
gcry_md_hash_buffer(algo, hash, passwordBuffer.data(), passwordBuffer.size());
for (int i = 1; i < rounds; ++i) {
memcpy(tmp, hash, hashLen);
gcry_md_hash_buffer(algo, hash, tmp, hashLen);
}
return salt + QString(QByteArray(hash, hashLen).toBase64());
// create an array for the digest in the proper size for the chosen algorithm
char digest[gcry_md_get_algo_dlen(HASH_ALGO)];
// calculate the message digest of passwordBuffer
gcry_md_hash_buffer(HASH_ALGO, digest, passwordBuffer.data(), passwordBuffer.size());
// concatenate and return salt and digest
return salt + QString(QByteArray(digest).toBase64());
}