Commit c8bff7ad authored by Cristian Stoica's avatar Cristian Stoica Committed by Richard Levitte
Browse files

speed.c: simplify aggregation of ecdsa --multi results 



CLA: trivial

Signed-off-by: default avatarCristian Stoica <cristian.stoica@nxp.com>

Reviewed-by: default avatarGeoff Thorpe <geoff@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1377)
parent 0d4de756

apps/speed.c

+6 −12
Original line number Diff line number Diff line
@@ -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) {
@@ -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;
@@ -3068,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;