arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add Android ARMv8 guards

pull/461/head
Jeffrey Walton 2017-08-07 21:04:23 -04:00
parent b4172f3dd0
commit 6590a928ce
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crc-simd.cpp
View File

@ -81,7 +81,7 @@ bool CPU_TryCRC32_ARMV8()
} }
return result; return result;
#else #else
# if defined(__ANDROID__) # if defined(__ANDROID__) && (defined(__aarch64__) || defined(__aarch32__))
if (android_getCpuFeatures() & ANDROID_CPU_ARM64_FEATURE_CRC32) if (android_getCpuFeatures() & ANDROID_CPU_ARM64_FEATURE_CRC32)
return true; return true;
// https://sourceware.org/ml/libc-help/2017-08/msg00012.html // https://sourceware.org/ml/libc-help/2017-08/msg00012.html

2
gcm-simd.cpp
View File

@ -214,7 +214,7 @@ bool CPU_TryPMULL_ARMV8()
} }
return result; return result;
# else # else
# if defined(__ANDROID__) # if defined(__ANDROID__) && (defined(__aarch64__) || defined(__aarch32__))
if (android_getCpuFeatures() & ANDROID_CPU_ARM64_FEATURE_PMULL) if (android_getCpuFeatures() & ANDROID_CPU_ARM64_FEATURE_PMULL)
return true; return true;
// https://sourceware.org/ml/libc-help/2017-08/msg00012.html // https://sourceware.org/ml/libc-help/2017-08/msg00012.html

3
rijndael-simd.cpp
View File

@ -104,7 +104,7 @@ bool CPU_TryAES_ARMV8()
} }
return result; return result;
# else # else
# if defined(__ANDROID__) # if defined(__ANDROID__) && (defined(__aarch64__) || defined(__aarch32__))
if (android_getCpuFeatures() & ANDROID_CPU_ARM64_FEATURE_AES) if (android_getCpuFeatures() & ANDROID_CPU_ARM64_FEATURE_AES)
return true; return true;
// https://sourceware.org/ml/libc-help/2017-08/msg00012.html // https://sourceware.org/ml/libc-help/2017-08/msg00012.html
@ -180,7 +180,6 @@ void Rijndael_Enc_ProcessAndXorBlock_ARMV8(const byte *inBlock, const byte *xorB
data = vaeseq_u8(data, vld1q_u8(keys+128)); data = vaeseq_u8(data, vld1q_u8(keys+128));
data = vaesmcq_u8(data); data = vaesmcq_u8(data);
// Unroll the loop, profit 0.3 cpb.
unsigned int i=9; unsigned int i=9;
for ( ; i<rounds-1; ++i) for ( ; i<rounds-1; ++i)
{ {

4
sha-simd.cpp
View File

@ -91,7 +91,7 @@ bool CPU_TrySHA1_ARMV8()
} }
return result; return result;
# else # else
# if defined(__ANDROID__) # if defined(__ANDROID__) && (defined(__aarch64__) || defined(__aarch32__))
if (android_getCpuFeatures() & ANDROID_CPU_ARM64_FEATURE_SHA1) if (android_getCpuFeatures() & ANDROID_CPU_ARM64_FEATURE_SHA1)
return true; return true;
// https://sourceware.org/ml/libc-help/2017-08/msg00012.html // https://sourceware.org/ml/libc-help/2017-08/msg00012.html
@ -161,7 +161,7 @@ bool CPU_TrySHA2_ARMV8()
} }
return result; return result;
#else #else
# if defined(__ANDROID__) # if defined(__ANDROID__) && (defined(__aarch64__) || defined(__aarch32__))
if (android_getCpuFeatures() & ANDROID_CPU_ARM64_FEATURE_SHA2) if (android_getCpuFeatures() & ANDROID_CPU_ARM64_FEATURE_SHA2)
return true; return true;
// https://sourceware.org/ml/libc-help/2017-08/msg00012.html // https://sourceware.org/ml/libc-help/2017-08/msg00012.html