From 7f8f61bfbd9d2defa5c56c93059a2467b6bd698f Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Sat, 27 Apr 2019 18:38:18 -0400 Subject: [PATCH] Update AlgorithmProvider() --- blake2.cpp | 2 +- blake2s_simd.cpp | 2 +- chacha.cpp | 2 +- simon.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/blake2.cpp b/blake2.cpp index 285a448a..f8872619 100644 --- a/blake2.cpp +++ b/blake2.cpp @@ -259,7 +259,7 @@ std::string BLAKE2s::AlgorithmProvider() const #endif #if (CRYPTOPP_POWER8_AVAILABLE) if (HasPower8()) - return "Power7"; + return "Power8"; else #elif (CRYPTOPP_ALTIVEC_AVAILABLE) if (HasAltivec()) diff --git a/blake2s_simd.cpp b/blake2s_simd.cpp index b964b25e..ff461da8 100644 --- a/blake2s_simd.cpp +++ b/blake2s_simd.cpp @@ -838,7 +838,7 @@ inline uint32x4_p VectorSet32(const uint32x4_p a, const uint32x4_p b, const uint32x4_p t0 = VectorSet32(a, b); const uint32x4_p t1 = VectorSet32(c, d); - // Power7 follows SSE2's implementation, and this is _mm_set_epi32. + // PowerPC follows SSE2's implementation, and this is _mm_set_epi32. const uint8x16_p mask = {20,21,22,23, 16,17,18,19, 4,5,6,7, 0,1,2,3}; return VecPermute(t0, t1, mask); } diff --git a/chacha.cpp b/chacha.cpp index 0e88467d..58fd2201 100644 --- a/chacha.cpp +++ b/chacha.cpp @@ -269,7 +269,7 @@ std::string ChaCha_AlgorithmProvider() #endif #if (CRYPTOPP_POWER8_AVAILABLE) if (HasPower8()) - return "Power7"; + return "Power8"; else #elif (CRYPTOPP_ALTIVEC_AVAILABLE) if (HasAltivec()) diff --git a/simon.cpp b/simon.cpp index f01b71b5..d508d974 100644 --- a/simon.cpp +++ b/simon.cpp @@ -257,7 +257,7 @@ std::string SIMON64::Base::AlgorithmProvider() const # endif # if (CRYPTOPP_POWER8_AVAILABLE) if (HasPower8()) - return "Power7"; + return "Power8"; # endif # if (CRYPTOPP_ALTIVEC_AVAILABLE) if (HasAltivec())