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

Removed stray XXX in blake2-simd.cpp

pull/461/head
Jeffrey Walton 2017-07-30 00:20:20 -04:00
parent 8338d90c10
commit 4b51eadc73
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
GNUmakefile
View File

@ -297,11 +297,10 @@ endif
endif endif
ifeq ($(IS_NEON),1) ifeq ($(IS_NEON),1)
NEON_FLAG = $(shell echo | $(CXX) $(CXXFLAGS) -mfpu=neon -dM -E - | grep -i -c -q __SSE4_2__ && echo "-mfpu=neon") NEON_FLAG = $(shell echo | $(CXX) $(CXXFLAGS) -march=armv7-a -mfloat-abi=softfp -mfpu=neon -dM -E - | grep -i -c -q __ARM_NEON && echo "-march=armv7-a -mfloat-abi=softfp -mfpu=neon")
GCM_FLAG = $(NEON_FLAG) GCM_FLAG = $(NEON_FLAG)
ARIA_FLAG = $(NEON_FLAG) ARIA_FLAG = $(NEON_FLAG)
BLAKE2_FLAG = $(NEON_FLAG) BLAKE2_FLAG = $(NEON_FLAG)
NEON_FLAG = $(NEON_FLAG)
endif endif
ifeq ($(IS_ARMV8),1) ifeq ($(IS_ARMV8),1)

2
blake2-simd.cpp
View File

@ -1580,8 +1580,6 @@ void BLAKE2_Compress64_SSE4(const byte* input, BLAKE2_State<word64, true>& state
#if CRYPTOPP_BOOL_ARM32 && CRYPTOPP_ARM_NEON_AVAILABLE #if CRYPTOPP_BOOL_ARM32 && CRYPTOPP_ARM_NEON_AVAILABLE
void BLAKE2_Compress32_NEON(const byte* input, BLAKE2_State<word32, false>& state) void BLAKE2_Compress32_NEON(const byte* input, BLAKE2_State<word32, false>& state)
{ {
XXX
#define BLAKE2S_LOAD_MSG_0_1(buf) \ #define BLAKE2S_LOAD_MSG_0_1(buf) \
do { uint32x2_t t0, t1; \ do { uint32x2_t t0, t1; \
t0 = vzip_u32(vget_low_u32(m0), vget_high_u32(m0)).val[0]; \ t0 = vzip_u32(vget_low_u32(m0), vget_high_u32(m0)).val[0]; \