[openssl-commits] [openssl] master update
Richard Levitte
levitte at openssl.org
Fri Feb 10 10:59:36 UTC 2017
The branch master has been updated
via 222c3da35cc508446df150a16080943019ba6f54 (commit)
via c8bff7ad501c38f1ce9bfe9392fcb22a709e0f6f (commit)
via 0d4de7563cdced60122059e9085ab8d7f66b9de4 (commit)
via 8ac2d1abb3691491bae2be1e8085171b0b5774d5 (commit)
from bd5d27c1c6d3f83464ddf5124f18a2cac2cbb37f (commit)
- Log -----------------------------------------------------------------
commit 222c3da35cc508446df150a16080943019ba6f54
Author: Cristian Stoica <cristian.stoica at nxp.com>
Date: Tue Aug 2 11:41:30 2016 +0300
speed.c: simplify aggregation of ecdh --multi results
CLA: trivial
Signed-off-by: Cristian Stoica <cristian.stoica at nxp.com>
Reviewed-by: Geoff Thorpe <geoff at openssl.org>
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1377)
commit c8bff7ad501c38f1ce9bfe9392fcb22a709e0f6f
Author: Cristian Stoica <cristian.stoica at nxp.com>
Date: Tue Aug 2 11:38:45 2016 +0300
speed.c: simplify aggregation of ecdsa --multi results
CLA: trivial
Signed-off-by: Cristian Stoica <cristian.stoica at nxp.com>
Reviewed-by: Geoff Thorpe <geoff at openssl.org>
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1377)
commit 0d4de7563cdced60122059e9085ab8d7f66b9de4
Author: Cristian Stoica <cristian.stoica at nxp.com>
Date: Tue Aug 2 11:22:27 2016 +0300
speed.c: simplify aggregation of dsa --multi results
CLA: trivial
Signed-off-by: Cristian Stoica <cristian.stoica at nxp.com>
Reviewed-by: Geoff Thorpe <geoff at openssl.org>
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1377)
commit 8ac2d1abb3691491bae2be1e8085171b0b5774d5
Author: Cristian Stoica <cristian.stoica at nxp.com>
Date: Tue Aug 2 11:13:00 2016 +0300
speed.c: simplify aggregation of rsa --multi results
CLA: trivial
Signed-off-by: Cristian Stoica <cristian.stoica at nxp.com>
Reviewed-by: Geoff Thorpe <geoff at openssl.org>
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1377)
-----------------------------------------------------------------------
Summary of changes:
apps/speed.c | 64 ++++++++++++++++++++----------------------------------------
1 file changed, 21 insertions(+), 43 deletions(-)
diff --git a/apps/speed.c b/apps/speed.c
index 8f2950e..c10a8ee 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -2360,7 +2360,7 @@ int speed_main(int argc, char **argv)
mr ? "+R1:%ld:%d:%.2f\n"
: "%ld %d bit private RSA's in %.2fs\n",
count, rsa_bits[testnum], d);
- rsa_results[testnum][0] = d / (double)count;
+ rsa_results[testnum][0] = (double)count / d;
rsa_count = count;
}
@@ -2386,7 +2386,7 @@ int speed_main(int argc, char **argv)
mr ? "+R2:%ld:%d:%.2f\n"
: "%ld %d bit public RSA's in %.2fs\n",
count, rsa_bits[testnum], d);
- rsa_results[testnum][1] = d / (double)count;
+ rsa_results[testnum][1] = (double)count / d;
}
if (rsa_count <= 1) {
@@ -2433,7 +2433,7 @@ int speed_main(int argc, char **argv)
mr ? "+R3:%ld:%d:%.2f\n"
: "%ld %d bit DSA signs in %.2fs\n",
count, dsa_bits[testnum], d);
- dsa_results[testnum][0] = d / (double)count;
+ dsa_results[testnum][0] = (double)count / d;
rsa_count = count;
}
@@ -2459,7 +2459,7 @@ int speed_main(int argc, char **argv)
mr ? "+R4:%ld:%d:%.2f\n"
: "%ld %d bit DSA verify in %.2fs\n",
count, dsa_bits[testnum], d);
- dsa_results[testnum][1] = d / (double)count;
+ dsa_results[testnum][1] = (double)count / d;
}
if (rsa_count <= 1) {
@@ -2519,7 +2519,7 @@ int speed_main(int argc, char **argv)
mr ? "+R5:%ld:%d:%.2f\n" :
"%ld %d bit ECDSA signs in %.2fs \n",
count, test_curves_bits[testnum], d);
- ecdsa_results[testnum][0] = d / (double)count;
+ ecdsa_results[testnum][0] = (double)count / d;
rsa_count = count;
}
@@ -2547,7 +2547,7 @@ int speed_main(int argc, char **argv)
mr ? "+R6:%ld:%d:%.2f\n"
: "%ld %d bit ECDSA verify in %.2fs\n",
count, test_curves_bits[testnum], d);
- ecdsa_results[testnum][1] = d / (double)count;
+ ecdsa_results[testnum][1] = (double)count / d;
}
if (rsa_count <= 1) {
@@ -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;
}
@@ -2789,8 +2789,8 @@ int speed_main(int argc, char **argv)
k, rsa_bits[k], rsa_results[k][0], rsa_results[k][1]);
else
printf("rsa %4u bits %8.6fs %8.6fs %8.1f %8.1f\n",
- rsa_bits[k], rsa_results[k][0], rsa_results[k][1],
- 1.0 / rsa_results[k][0], 1.0 / rsa_results[k][1]);
+ rsa_bits[k], 1.0 / rsa_results[k][0], 1.0 / rsa_results[k][1],
+ rsa_results[k][0], rsa_results[k][1]);
}
#endif
#ifndef OPENSSL_NO_DSA
@@ -2807,8 +2807,8 @@ int speed_main(int argc, char **argv)
k, dsa_bits[k], dsa_results[k][0], dsa_results[k][1]);
else
printf("dsa %4u bits %8.6fs %8.6fs %8.1f %8.1f\n",
- dsa_bits[k], dsa_results[k][0], dsa_results[k][1],
- 1.0 / dsa_results[k][0], 1.0 / dsa_results[k][1]);
+ dsa_bits[k], 1.0 / dsa_results[k][0], 1.0 / dsa_results[k][1],
+ dsa_results[k][0], dsa_results[k][1]);
}
#endif
#ifndef OPENSSL_NO_EC
@@ -2829,8 +2829,8 @@ int speed_main(int argc, char **argv)
printf("%4u bit ecdsa (%s) %8.4fs %8.4fs %8.1f %8.1f\n",
test_curves_bits[k],
test_curves_names[k],
- ecdsa_results[k][0], ecdsa_results[k][1],
- 1.0 / ecdsa_results[k][0], 1.0 / ecdsa_results[k][1]);
+ 1.0 / ecdsa_results[k][0], 1.0 / ecdsa_results[k][1],
+ ecdsa_results[k][0], ecdsa_results[k][1]);
}
testnum = 1;
@@ -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
@@ -3037,16 +3037,10 @@ static int do_multi(int multi)
sstrsep(&p, sep);
d = atof(sstrsep(&p, sep));
- if (n)
- rsa_results[k][0] = 1 / (1 / rsa_results[k][0] + 1 / d);
- else
- rsa_results[k][0] = d;
+ rsa_results[k][0] += d;
d = atof(sstrsep(&p, sep));
- if (n)
- rsa_results[k][1] = 1 / (1 / rsa_results[k][1] + 1 / d);
- else
- rsa_results[k][1] = d;
+ rsa_results[k][1] += d;
}
# ifndef OPENSSL_NO_DSA
else if (strncmp(buf, "+F3:", 4) == 0) {
@@ -3058,16 +3052,10 @@ static int do_multi(int multi)
sstrsep(&p, sep);
d = atof(sstrsep(&p, sep));
- if (n)
- dsa_results[k][0] = 1 / (1 / dsa_results[k][0] + 1 / d);
- else
- dsa_results[k][0] = d;
+ dsa_results[k][0] += d;
d = atof(sstrsep(&p, sep));
- if (n)
- dsa_results[k][1] = 1 / (1 / dsa_results[k][1] + 1 / d);
- else
- dsa_results[k][1] = d;
+ dsa_results[k][1] += d;
}
# endif
# ifndef OPENSSL_NO_EC
@@ -3080,16 +3068,10 @@ static int do_multi(int multi)
sstrsep(&p, sep);
d = atof(sstrsep(&p, sep));
- if (n)
- ecdsa_results[k][0] = 1 / (1 / ecdsa_results[k][0] + 1 / d);
- else
- ecdsa_results[k][0] = d;
+ ecdsa_results[k][0] += d;
d = atof(sstrsep(&p, sep));
- if (n)
- ecdsa_results[k][1] = 1 / (1 / ecdsa_results[k][1] + 1 / d);
- else
- ecdsa_results[k][1] = d;
+ ecdsa_results[k][1] += d;
} else if (strncmp(buf, "+F5:", 4) == 0) {
int k;
double d;
@@ -3099,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
More information about the openssl-commits
mailing list