Two new Curve25519 implementations (generic "i31" code, and optimised code with MUL31).

[BearSSL] / test / test_speed.c

diff --git a/test/test_speed.c b/test/test_speed.c
index 48c2fdb..458d765 100644 (file)
--- a/test/test_speed.c
+++ b/test/test_speed.c
@@ -687,40 +687,60 @@ test_speed_ec_inner(const char *name,
 static void
 test_speed_ec_p256_m15(void)
 {
-       test_speed_ec_inner("EC m15 P-256",
+       test_speed_ec_inner("EC p256_m15",
                &br_ec_p256_m15, &br_secp256r1);
 }
 
 static void
 test_speed_ec_prime_i15(void)
 {
-       test_speed_ec_inner("EC i15 P-256", &br_ec_prime_i15, &br_secp256r1);
-       test_speed_ec_inner("EC i15 P-384", &br_ec_prime_i15, &br_secp384r1);
-       test_speed_ec_inner("EC i15 P-521", &br_ec_prime_i15, &br_secp521r1);
+       test_speed_ec_inner("EC prime_i15 P-256",
+               &br_ec_prime_i15, &br_secp256r1);
+       test_speed_ec_inner("EC prime_i15 P-384",
+               &br_ec_prime_i15, &br_secp384r1);
+       test_speed_ec_inner("EC prime_i15 P-521",
+               &br_ec_prime_i15, &br_secp521r1);
 }
 
 static void
 test_speed_ec_prime_i31(void)
 {
-       test_speed_ec_inner("EC i31 P-256", &br_ec_prime_i31, &br_secp256r1);
-       test_speed_ec_inner("EC i31 P-384", &br_ec_prime_i31, &br_secp384r1);
-       test_speed_ec_inner("EC i31 P-521", &br_ec_prime_i31, &br_secp521r1);
+       test_speed_ec_inner("EC prime_i31 P-256",
+               &br_ec_prime_i31, &br_secp256r1);
+       test_speed_ec_inner("EC prime_i31 P-384",
+               &br_ec_prime_i31, &br_secp384r1);
+       test_speed_ec_inner("EC prime_i31 P-521",
+               &br_ec_prime_i31, &br_secp521r1);
 }
 
 static void
 test_speed_ec_c25519_i15(void)
 {
-       test_speed_ec_inner("EC i15 C25519",
+       test_speed_ec_inner("EC c25519_i15",
                &br_ec_c25519_i15, &br_curve25519);
 }
 
+static void
+test_speed_ec_c25519_i31(void)
+{
+       test_speed_ec_inner("EC c25519_i31",
+               &br_ec_c25519_i31, &br_curve25519);
+}
+
 static void
 test_speed_ec_c25519_m15(void)
 {
-       test_speed_ec_inner("EC m15 C25519",
+       test_speed_ec_inner("EC c25519_m15",
                &br_ec_c25519_m15, &br_curve25519);
 }
 
+static void
+test_speed_ec_c25519_m31(void)
+{
+       test_speed_ec_inner("EC c25519_m31",
+               &br_ec_c25519_m31, &br_curve25519);
+}
+
 static void
 test_speed_ecdsa_inner(const char *name,
        const br_ec_impl *impl, const br_ec_curve_def *cd,
@@ -1259,11 +1279,13 @@ static const struct {
        STU(rsa_i15),
        STU(rsa_i31),
        STU(rsa_i32),
-       STU(ec_p256_m15),
        STU(ec_prime_i15),
        STU(ec_prime_i31),
+       STU(ec_p256_m15),
        STU(ec_c25519_i15),
+       STU(ec_c25519_i31),
        STU(ec_c25519_m15),
+       STU(ec_c25519_m31),
        STU(ecdsa_p256_m15),
        STU(ecdsa_i15),
        STU(ecdsa_i31),