For consistency with the terminology used in my SAC2001 paper, avoid

the term "simultaneous multiplication" (which -- acording to the
paper, at least -- applies only to certain methods which we don't use
here)

diff --git a/crypto/ec/ectest.c b/crypto/ec/ectest.c
index bebfb24e42457c79ffd639d68db2c93203d71e21..c1f0b44c9bd1948b1c78b47d19bff9563e8057f4 100644 (file)
--- a/crypto/ec/ectest.c
+++ b/crypto/ec/ectest.c
@@ -76,7 +76,7 @@ int main(int argc, char * argv[]) { puts("Elliptic curves are disabled."); retur
 } while (0)
 
 
-void timings(EC_GROUP *group, int simult, BN_CTX *ctx)
+void timings(EC_GROUP *group, int multi, BN_CTX *ctx)
        {
        clock_t clck;
        int i, j;
@@ -101,13 +101,13 @@ void timings(EC_GROUP *group, int simult, BN_CTX *ctx)
        for (i = 0; i < 10; i++)
                {
                if (!BN_pseudo_rand(s, BN_num_bits(s), 0, 0)) ABORT;
-               if (simult)
+               if (multi)
                        {
                        if (!BN_pseudo_rand(s0, BN_num_bits(s), 0, 0)) ABORT;
                        }
                for (j = 0; j < 10; j++)
                        {
-                       if (!EC_POINT_mul(group, P, s, simult ? P : NULL, simult ? s0 : NULL, ctx)) ABORT;
+                       if (!EC_POINT_mul(group, P, s, multi ? P : NULL, multi ? s0 : NULL, ctx)) ABORT;
                        }
                fprintf(stdout, ".");
                fflush(stdout);
@@ -130,7 +130,7 @@ void timings(EC_GROUP *group, int simult, BN_CTX *ctx)
 #endif
 
        fprintf(stdout, "%i %s in %.2f " UNIT "\n", i*j,
-               simult ? "s*P+t*Q operations" : "point multiplications",
+               multi ? "s*P+t*Q operations" : "point multiplications",
                (double)clck/CLOCKS_PER_SEC);
        fprintf(stdout, "average: %.4f " UNIT "\n", (double)clck/(CLOCKS_PER_SEC*i*j));
 
@@ -551,7 +551,7 @@ int main(int argc, char *argv[])
                scalars[0] = y; /* (group order + 1)/2,  so  y*Q + y*Q = Q */
                scalars[1] = y;
 
-               fprintf(stdout, "simultaneous multiplication ...");
+               fprintf(stdout, "combined multiplication ...");
                fflush(stdout);
 
                /* z is still the group order */