From 585b23d7b10a78eb5f04a713a978a091c848ae63 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Tue, 7 Mar 2017 04:39:08 -0500 Subject: [PATCH] Removed test define from rdrand.cpp The library should use the intrinsics if they are available. This change should have been included with Commit 14d92f9eba81191e. --- rdrand.cpp | 8 ++++---- rdrand.h | 3 --- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/rdrand.cpp b/rdrand.cpp index cba095ad..48719c5b 100644 --- a/rdrand.cpp +++ b/rdrand.cpp @@ -42,14 +42,14 @@ #if defined(CRYPTOPP_CPUID_AVAILABLE) # if defined(CRYPTOPP_MSC_VERSION) # if (CRYPTOPP_MSC_VERSION >= 1700) -# define MASM_RDRAND_ASM_AVAILABLE 1 -// # define ALL_RDRAND_INTRIN_AVAILABLE 1 +// # define MASM_RDRAND_ASM_AVAILABLE 1 +# define ALL_RDRAND_INTRIN_AVAILABLE 1 # else # define MASM_RDRAND_ASM_AVAILABLE 1 # endif # if (CRYPTOPP_MSC_VERSION >= 1800) -# define MASM_RDSEED_ASM_AVAILABLE 1 -// # define ALL_RDSEED_INTRIN_AVAILABLE 1 +// # define MASM_RDSEED_ASM_AVAILABLE 1 +# define ALL_RDSEED_INTRIN_AVAILABLE 1 # else # define MASM_RDSEED_ASM_AVAILABLE 1 # endif diff --git a/rdrand.h b/rdrand.h index 10369b1c..8fdaa148 100644 --- a/rdrand.h +++ b/rdrand.h @@ -128,9 +128,6 @@ public: // Override to avoid the base class' throw. CRYPTOPP_UNUSED(input); CRYPTOPP_UNUSED(length); } - -private: - unsigned int m_retries; }; NAMESPACE_END