libAthena/athena
2
0
Fork 0
mirror of https://github.com/libAthena/athena.git synced 2025-12-10 05:57:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

windows packaging and CMake adjustments

Browse Source
This commit is contained in:
Jack Andersen
2015-07-10 13:44:31 -10:00
parent 4f8df65a3d
commit 55adeec69c
10 changed files with 63 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/aes.cpp
View File

@@ -1,7 +1,11 @@
#include "aes.hpp"
#include <stdio.h>
#include <string.h>
#if _WIN32
#include <intrin.h>
#else
#include <cpuid.h>
#endif
namespace Athena
{
@@ -478,7 +482,7 @@ void SoftwareAES::encrypt(const uint8_t* iv, const uint8_t* inbuf, uint8_t* outb
}
}
#if __AES__
#if __AES__ || _MSC_VER >= 1800
#include <wmmintrin.h>
@@ -598,12 +602,18 @@ public:
static int HAS_AES_NI = -1;
std::unique_ptr<IAES> NewAES()
{
#if __AES__
#if __AES__ || _MSC_VER >= 1800
if (HAS_AES_NI == -1)
{
#if _MSC_VER
int info[4];
__cpuid(info, 1);
HAS_AES_NI = ((info[2] & 0x2000000) != 0);
#else
unsigned int a,b,c,d;
__cpuid(1, a,b,c,d);
HAS_AES_NI = ((c & 0x2000000) != 0);
#endif
}
if (HAS_AES_NI)
return std::unique_ptr<IAES>(new NiAES);