Merge pull request #391

b19456d Re-enable optimized slow-hash if someone is trying to compile w/MSVC (disabling it was unintentional) (Javier Smooth)
This commit is contained in:
Riccardo Spagni 2015-08-29 23:44:13 +02:00
commit b727efdb3d
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD

View File

@ -37,7 +37,7 @@
#include "hash-ops.h" #include "hash-ops.h"
#include "oaes_lib.h" #include "oaes_lib.h"
#if defined(__x86_64__) #if defined(__x86_64__) || (defined(_MSC_VER) && defined(_WIN64))
// Optimised code below, uses x86-specific intrinsics, SSE2, AES-NI // Optimised code below, uses x86-specific intrinsics, SSE2, AES-NI
// Fall back to more portable code is down at the bottom // Fall back to more portable code is down at the bottom