Cleared issues 11,12,13 (Clang integrated assembler), 58 (RC rollup), 66 (Coverity rollup)

1 files changed, 13 insertions, 9 deletions

diff --git a/bench2.cpp b/bench2.cpp
index afe4b77b..308136ca 100644
--- a/bench2.cpp
+++ b/bench2.cpp
@@ -48,7 +48,7 @@ void BenchMarkEncryption(const char *name, PK_Encryptor &key, double timeTotal,
 	SecByteBlock plaintext(len), ciphertext(key.CiphertextLength(len));

 	GlobalRNG().GenerateBlock(plaintext, len);

 

-	clock_t start = clock();

+	const clock_t start = clock();

 	unsigned int i;

 	double timeTaken;

 	for (timeTaken=(double)0, i=0; timeTaken < timeTotal; timeTaken = double(clock() - start) / CLOCK_TICKS_PER_SECOND, i++)

@@ -71,7 +71,7 @@ void BenchMarkDecryption(const char *name, PK_Decryptor &priv, PK_Encryptor &pub
 	GlobalRNG().GenerateBlock(plaintext, len);

 	pub.Encrypt(GlobalRNG(), plaintext, len, ciphertext);

 

-	clock_t start = clock();

+	const clock_t start = clock();

 	unsigned int i;

 	double timeTaken;

 	for (timeTaken=(double)0, i=0; timeTaken < timeTotal; timeTaken = double(clock() - start) / CLOCK_TICKS_PER_SECOND, i++)

@@ -86,7 +86,7 @@ void BenchMarkSigning(const char *name, PK_Signer &key, double timeTotal, bool p
 	AlignedSecByteBlock message(len), signature(key.SignatureLength());

 	GlobalRNG().GenerateBlock(message, len);

 

-	clock_t start = clock();

+	const clock_t start = clock();

 	unsigned int i;

 	double timeTaken;

 	for (timeTaken=(double)0, i=0; timeTaken < timeTotal; timeTaken = double(clock() - start) / CLOCK_TICKS_PER_SECOND, i++)

@@ -108,11 +108,15 @@ void BenchMarkVerification(const char *name, const PK_Signer &priv, PK_Verifier
 	GlobalRNG().GenerateBlock(message, len);

 	priv.SignMessage(GlobalRNG(), message, len, signature);

 

-	clock_t start = clock();

+	const clock_t start = clock();

 	unsigned int i;

 	double timeTaken;

 	for (timeTaken=(double)0, i=0; timeTaken < timeTotal; timeTaken = double(clock() - start) / CLOCK_TICKS_PER_SECOND, i++)

-		pub.VerifyMessage(message, len, signature, signature.size());

+	{

+		// The return value is ignored because we are interested in throughput

+		bool unused = pub.VerifyMessage(message, len, signature, signature.size());

+		CRYPTOPP_UNUSED(unused);

+	}

 

 	OutputResultOperations(name, "Verification", pc, i, timeTaken);

 

@@ -127,7 +131,7 @@ void BenchMarkKeyGen(const char *name, SimpleKeyAgreementDomain &d, double timeT
 {

 	SecByteBlock priv(d.PrivateKeyLength()), pub(d.PublicKeyLength());

 

-	clock_t start = clock();

+	const clock_t start = clock();

 	unsigned int i;

 	double timeTaken;

 	for (timeTaken=(double)0, i=0; timeTaken < timeTotal; timeTaken = double(clock() - start) / CLOCK_TICKS_PER_SECOND, i++)

@@ -146,7 +150,7 @@ void BenchMarkKeyGen(const char *name, AuthenticatedKeyAgreementDomain &d, doubl
 {

 	SecByteBlock priv(d.EphemeralPrivateKeyLength()), pub(d.EphemeralPublicKeyLength());

 

-	clock_t start = clock();

+	const clock_t start = clock();

 	unsigned int i;

 	double timeTaken;

 	for (timeTaken=(double)0, i=0; timeTaken < timeTotal; timeTaken = double(clock() - start) / CLOCK_TICKS_PER_SECOND, i++)

@@ -169,7 +173,7 @@ void BenchMarkAgreement(const char *name, SimpleKeyAgreementDomain &d, double ti
 	d.GenerateKeyPair(GlobalRNG(), priv2, pub2);

 	SecByteBlock val(d.AgreedValueLength());

 

-	clock_t start = clock();

+	const clock_t start = clock();

 	unsigned int i;

 	double timeTaken;

 	for (timeTaken=(double)0, i=0; timeTaken < timeTotal; timeTaken = double(clock() - start) / CLOCK_TICKS_PER_SECOND, i+=2)

@@ -193,7 +197,7 @@ void BenchMarkAgreement(const char *name, AuthenticatedKeyAgreementDomain &d, do
 	d.GenerateEphemeralKeyPair(GlobalRNG(), epriv2, epub2);

 	SecByteBlock val(d.AgreedValueLength());

 

-	clock_t start = clock();

+	const clock_t start = clock();

 	unsigned int i;

 	double timeTaken;

 	for (timeTaken=(double)0, i=0; timeTaken < timeTotal; timeTaken = double(clock() - start) / CLOCK_TICKS_PER_SECOND, i+=2)