The branch master has been updated
via dfba17b4f3b2f87b50f2251a608d1911bfd202bc (commit)
via 686e344918229cae90562384c01606ba88ed51ba (commit)
from eb647452eb73be491521980f45582c63f7194521 (commit)
- Log -----------------------------------------------------------------
commit dfba17b4f3b2f87b50f2251a608d1911bfd202bc
Author: Tim Hudson <t...@openssl.org>
Date: Mon Aug 17 22:20:06 2015 +1000
Restore previous behaviour of only running one algorithm when -evp alg is
used.
Submitted by: Eric Young <e...@pobox.com>
Reviewed-by: Ben Laurie <b...@openssl.org>
commit 686e344918229cae90562384c01606ba88ed51ba
Author: Tim Hudson <t...@openssl.org>
Date: Mon Aug 17 22:16:39 2015 +1000
restore usage of -elapsed that was disabled in the ifdef reorg
Reviewed-by: Ben Laurie <b...@openssl.org>
-----------------------------------------------------------------------
Summary of changes:
apps/speed.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/apps/speed.c b/apps/speed.c
index ca93d2c..b4722f1 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -364,10 +364,8 @@ OPTIONS speed_options[] = {
{"mr", OPT_MR, '-', "Produce machine readable output"},
{"mb", OPT_MB, '-'},
{"misalign", OPT_MISALIGN, 'n', "Amount to mis-align buffers"},
-#if defined(TIMES) || defined(USE_TOD)
{"elapsed", OPT_ELAPSED, '-',
"Measure time in real time instead of CPU user time"},
-#endif
#ifndef NO_FORK
{"multi", OPT_MULTI, 'p', "Run benchmarks in parallel"},
#endif
@@ -755,9 +753,6 @@ int speed_main(int argc, char **argv)
long ecdh_c[EC_NUM][2];
int ecdh_doit[EC_NUM];
#endif
-#ifndef TIMES
- usertime = -1;
-#endif
memset(results, 0, sizeof(results));
#ifndef OPENSSL_NO_DSA
@@ -949,7 +944,7 @@ int speed_main(int argc, char **argv)
#endif
/* No parameters; turn on everything. */
- if (argc == 0) {
+ if ((argc == 0) && !doit[D_EVP]) {
for (i = 0; i < ALGOR_NUM; i++)
if (i != D_EVP)
doit[i] = 1;
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
