From 6d339011a84465c553ed64f79d24c3458befe678 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Tue, 22 Jan 2019 05:11:50 -0500 Subject: [PATCH] Remove /openmp from cryptest.nmake This has cross-pollinated twice in two days --- cryptest.nmake | 2 +- xed25519.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cryptest.nmake b/cryptest.nmake index f759b650..1c547ed3 100644 --- a/cryptest.nmake +++ b/cryptest.nmake @@ -154,7 +154,7 @@ LDLIBS = # Debug build. # CXXFLAGS = $(CXXFLAGS) /DDEBUG /D_DEBUG /Oi /Oy- /Od /MTd # Release build. Add /OPT:REF to linker -CXXFLAGS = $(CXXFLAGS) /DNDEBUG /D_NDEBUG /Oi /Oy /O2 /MT /openmp +CXXFLAGS = $(CXXFLAGS) /DNDEBUG /D_NDEBUG /Oi /Oy /O2 /MT # Linker flags. LDFLAGS = $(LDFLAGS) /OPT:REF diff --git a/xed25519.cpp b/xed25519.cpp index f8544f34..05414e45 100644 --- a/xed25519.cpp +++ b/xed25519.cpp @@ -468,7 +468,7 @@ void ed25519PrivateKey::GenerateRandom(RandomNumberGenerator &rng, const NameVal if (params.GetValue(Name::Seed(), seed) && rng.CanIncorporateEntropy()) rng.IncorporateEntropy(seed.begin(), seed.size()); - rng.GenerateBlock(m_sk, SECRET_KEYLENGTH); + rng.GenerateBlock(m_sk, 32); m_sk[0] &= 248; m_sk[31] &= 127; m_sk[31] |= 64; int ret = Donna::ed25519_publickey(m_pk, m_sk); CRYPTOPP_ASSERT(ret == 0); CRYPTOPP_UNUSED(ret);