Commit 2deabebc authored by Max-Wilhelm Bruker's avatar Max-Wilhelm Bruker
Browse files

added PasswordHasher::initialize() to make libgcrypt warnings go away

parent 2789116d
...@@ -157,6 +157,8 @@ int main(int argc, char *argv[]) ...@@ -157,6 +157,8 @@ int main(int argc, char *argv[])
std::cerr << "Servatrice " << VERSION_STRING << " starting." << std::endl; std::cerr << "Servatrice " << VERSION_STRING << " starting." << std::endl;
std::cerr << "-------------------------" << std::endl; std::cerr << "-------------------------" << std::endl;
PasswordHasher::initialize();
if (testRandom) if (testRandom)
testRNG(); testRNG();
if (testHashFunction) if (testHashFunction)
......
...@@ -3,6 +3,14 @@ ...@@ -3,6 +3,14 @@
#include <string.h> #include <string.h>
#include <gcrypt.h> #include <gcrypt.h>
void PasswordHasher::initialize()
{
// These calls are required by libgcrypt before we use any of its functions.
gcry_check_version(0);
gcry_control(GCRYCTL_DISABLE_SECMEM, 0);
gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
}
QString PasswordHasher::computeHash(const QString &password, const QString &salt) QString PasswordHasher::computeHash(const QString &password, const QString &salt)
{ {
const int algo = GCRY_MD_SHA512; const int algo = GCRY_MD_SHA512;
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
class PasswordHasher { class PasswordHasher {
public: public:
static void initialize();
static QString computeHash(const QString &password, const QString &salt); static QString computeHash(const QString &password, const QString &salt);
}; };
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment