From bf37ccda6d9301a16012f7ed2c2fa20ee8079048 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Sun, 29 Jul 2018 21:25:48 -0400 Subject: [PATCH] Fix initialization of 'pass' variable Copy/paste error from https://github.com/weidai11/cryptopp/commit/d51f701e0638 --- validat3.cpp | 1 - validat7.cpp | 4 ++-- validat8.cpp | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/validat3.cpp b/validat3.cpp index 4c12a593..e393715d 100644 --- a/validat3.cpp +++ b/validat3.cpp @@ -171,7 +171,6 @@ bool ValidateAll(bool thorough) pass=ValidateXTR_DH() && pass; pass=ValidateRabin() && pass; pass=ValidateRW() && pass; -// pass=ValidateBlumGoldwasser() && pass; pass=ValidateECP() && pass; pass=ValidateEC2N() && pass; pass=ValidateECDSA() && pass; diff --git a/validat7.cpp b/validat7.cpp index f97911bd..a406650d 100644 --- a/validat7.cpp +++ b/validat7.cpp @@ -314,7 +314,7 @@ bool ValidateECP_Agreement() { ECDH::Domain ecdhc(ASN1::secp192r1()); ECMQV::Domain ecmqvc(ASN1::secp192r1()); - bool pass = SimpleKeyAgreementValidate(ecdhc) && pass; + bool pass = SimpleKeyAgreementValidate(ecdhc); pass = AuthenticatedKeyAgreementValidate(ecmqvc) && pass; std::cout << "Turning on point compression..." << std::endl; @@ -330,7 +330,7 @@ bool ValidateEC2N_Agreement() { ECDH::Domain ecdhc(ASN1::sect193r1()); ECMQV::Domain ecmqvc(ASN1::sect193r1()); - bool pass = SimpleKeyAgreementValidate(ecdhc) && pass; + bool pass = SimpleKeyAgreementValidate(ecdhc); pass = AuthenticatedKeyAgreementValidate(ecmqvc) && pass; std::cout << "Turning on point compression..." << std::endl; diff --git a/validat8.cpp b/validat8.cpp index ba458877..1562d27c 100644 --- a/validat8.cpp +++ b/validat8.cpp @@ -129,7 +129,7 @@ bool ValidateECP_Encrypt() cpub.AccessKey().Precompute(); cpriv.AccessKey().Precompute(); - bool pass = CryptoSystemValidate(cpriv, cpub) && pass; + bool pass = CryptoSystemValidate(cpriv, cpub); std::cout << "Turning on point compression..." << std::endl; cpriv.AccessKey().AccessGroupParameters().SetPointCompression(true); @@ -148,7 +148,7 @@ bool ValidateEC2N_Encrypt() cpriv.AccessMaterial().Save(bq); cpub.AccessKey().AccessGroupParameters().SetEncodeAsOID(true); cpub.AccessMaterial().Save(bq); - bool pass = CryptoSystemValidate(cpriv, cpub) && pass; + bool pass = CryptoSystemValidate(cpriv, cpub); std::cout << "Turning on point compression..." << std::endl; cpriv.AccessKey().AccessGroupParameters().SetPointCompression(true);