diff options
| author | Cristian Stoica <cristian.stoica@nxp.com> | 2016-08-02 11:41:30 +0300 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2017-02-10 11:59:33 +0100 |
| commit | 222c3da35cc508446df150a16080943019ba6f54 (patch) | |
| tree | daa03db22cc8eb31c5e9a80cecb6fd25e2774fb1 /apps | |
| parent | c8bff7ad501c38f1ce9bfe9392fcb22a709e0f6f (diff) | |
| download | openssl-222c3da35cc508446df150a16080943019ba6f54.tar.gz | |
speed.c: simplify aggregation of ecdh --multi results
CLA: trivial
Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
Reviewed-by: Geoff Thorpe <geoff@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1377)
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/speed.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/apps/speed.c b/apps/speed.c index 462e3e7cfe..c10a8ee197 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -2709,7 +2709,7 @@ int speed_main(int argc, char **argv) mr ? "+R7:%ld:%d:%.2f\n" : "%ld %d-bit ECDH ops in %.2fs\n", count, test_curves_bits[testnum], d); - ecdh_results[testnum][0] = d / (double)count; + ecdh_results[testnum][0] = (double)count / d; rsa_count = count; } @@ -2850,7 +2850,7 @@ int speed_main(int argc, char **argv) printf("%4u bit ecdh (%s) %8.4fs %8.1f\n", test_curves_bits[k], test_curves_names[k], - ecdh_results[k][0], 1.0 / ecdh_results[k][0]); + 1.0 / ecdh_results[k][0], ecdh_results[k][0]); } #endif @@ -3081,11 +3081,7 @@ static int do_multi(int multi) sstrsep(&p, sep); d = atof(sstrsep(&p, sep)); - if (n) - ecdh_results[k][0] = 1 / (1 / ecdh_results[k][0] + 1 / d); - else - ecdh_results[k][0] = d; - + ecdh_results[k][0] += d; } # endif |