From: Felix Laurie von Massenbach <felix@erbridge.co.uk>
Date: Tue, 27 May 2014 12:38:59 +0000 (+0100)
Subject: Only count successful generations.
X-Git-Tag: master-post-reformat~758^2~7
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a77889f5609cf49f0c72e1cc414a6c15f7d3cef0;p=oweals%2Fopenssl.git

Only count successful generations.
---

diff --git a/apps/speed.c b/apps/speed.c
index eec2fd0999..00a7f1906f 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -2037,7 +2037,7 @@ int MAIN(int argc, char **argv)
 			
 		Time_F(START);
 		for (count=0, run=1; COND(prime_c[D_PRIME_TRIAL_DIVISION]); count++)
-			bn_probable_prime_dh(rnd, 1024, add, NULL, ctx);
+			if (!bn_probable_prime_dh(rnd, 1024, add, NULL, ctx)) count--;
 		
 		d=Time_F(STOP);
 		prime_print_result(D_PRIME_TRIAL_DIVISION, count, d);
@@ -2057,7 +2057,7 @@ int MAIN(int argc, char **argv)
 			
 		Time_F(START);
 		for (count=0, run=1; COND(prime_c[D_PRIME_TRIAL_DIVISION_RETRY]); count++)
-			bn_probable_prime_dh_retry(rnd, 1024, ctx);
+			if (!bn_probable_prime_dh_retry(rnd, 1024, ctx)) count--;
 		
 		d=Time_F(STOP);
 		prime_print_result(D_PRIME_TRIAL_DIVISION_RETRY, count, d);
@@ -2076,7 +2076,7 @@ int MAIN(int argc, char **argv)
 			
 		Time_F(START);
 		for (count=0, run=1; COND(prime_c[D_PRIME_COPRIME]); count++)
-			bn_probable_prime_dh_coprime(rnd, 1024, ctx);
+			if (!bn_probable_prime_dh_coprime(rnd, 1024, ctx)) count--;
 		
 		d=Time_F(STOP);
 		prime_print_result(D_PRIME_COPRIME, count, d);