Index: sources/utility/encryption.cpp =================================================================== diff -u -rc73feffa73c7fe073a7a7581144f5806dfc91beb -r76680860f735250b4557eb18fe7422a26c406f23 --- sources/utility/encryption.cpp (.../encryption.cpp) (revision c73feffa73c7fe073a7a7581144f5806dfc91beb) +++ sources/utility/encryption.cpp (.../encryption.cpp) (revision 76680860f735250b4557eb18fe7422a26c406f23) @@ -7,7 +7,7 @@ #include // Project -#include "DeviceController.h" +//#include "DeviceController.h" QString encryption::__salt__ = ""; @@ -42,10 +42,8 @@ } QString encryption::fixSalt() { - /// 83 hr 0 u 2 N 3 m ^+ i P 0 ur - /// 83hr0u2N3m^+iP0ur - QString s = "83hr0u2N3m^+iP0ur"; - return s; + const char c [ ] = { 56, 51, 104, 114, 48, 117, 50, 78, 51, 109, 94, 43, 105, 80, 48, 117, 114, 0 }; + return QString(c); } /*! @@ -93,11 +91,6 @@ QByteArray hashed = QPasswordDigestor::deriveKeyPbkdf2(algorithm, vString.toUtf8(), shuffle( salt ), iter, len).toHex(); //DEBUG: qDebug() << "hashed:" << vString << hashed; return hashed; - - //TODO: This seemed too much and I removed it for now. - // QString shuffled = shuffle(hashed); - // qDebug() << "shuffled:" << shuffled; - // return shuffled; } /*!