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

Remove /openmp from cryptest.nmake 

This has cross-pollinated twice in two days
pull/795/head
Jeffrey Walton 2019-01-22 05:11:50 -05:00
parent ef1b391ce6
commit 6d339011a8
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cryptest.nmake
View File

@ -154,7 +154,7 @@ LDLIBS =
# Debug build. # Debug build.
# CXXFLAGS = $(CXXFLAGS) /DDEBUG /D_DEBUG /Oi /Oy- /Od /MTd # CXXFLAGS = $(CXXFLAGS) /DDEBUG /D_DEBUG /Oi /Oy- /Od /MTd
# Release build. Add /OPT:REF to linker # 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. # Linker flags.
LDFLAGS = $(LDFLAGS) /OPT:REF LDFLAGS = $(LDFLAGS) /OPT:REF

2
xed25519.cpp
View File

@ -468,7 +468,7 @@ void ed25519PrivateKey::GenerateRandom(RandomNumberGenerator &rng, const NameVal
if (params.GetValue(Name::Seed(), seed) && rng.CanIncorporateEntropy()) if (params.GetValue(Name::Seed(), seed) && rng.CanIncorporateEntropy())
rng.IncorporateEntropy(seed.begin(), seed.size()); 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; m_sk[0] &= 248; m_sk[31] &= 127; m_sk[31] |= 64;
int ret = Donna::ed25519_publickey(m_pk, m_sk); int ret = Donna::ed25519_publickey(m_pk, m_sk);
CRYPTOPP_ASSERT(ret == 0); CRYPTOPP_UNUSED(ret); CRYPTOPP_ASSERT(ret == 0); CRYPTOPP_UNUSED(ret);