diff options
Diffstat (limited to 'src/murmur/PBKDF2.cpp')
| -rw-r--r-- | src/murmur/PBKDF2.cpp | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/src/murmur/PBKDF2.cpp b/src/murmur/PBKDF2.cpp index e521b5112..91857ee39 100644 --- a/src/murmur/PBKDF2.cpp +++ b/src/murmur/PBKDF2.cpp @@ -34,10 +34,27 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "murmur_pch.h" +#include <QtCore/QtGlobal> + +#ifdef Q_OS_WIN +// <openssl/rand.h> includes <windows.h> without defining NOMINMAX, +// which breaks our compilation because of the "max" macro. +#ifndef NOMINMAX +# define NOMINMAX +#endif +#endif #include "PBKDF2.h" +#include <QtCore/QElapsedTimer> +#include <QtCore/QLatin1String> + +#include <openssl/err.h> +#include <openssl/evp.h> +#include <openssl/rand.h> + +#include <limits> + int PBKDF2::benchmark() { const QString pseudopass(QLatin1String("aboutAvg")); const QString hexSalt = getSalt(); // Could tolerate not getting a salt here, will likely only make it harder. |