X-Git-Url: https://www.bearssl.org/gitweb//home/git/?p=BearSSL;a=blobdiff_plain;f=test%2Ftest_speed.c;h=458d76540c3468021796a4621cc4cdf19c42e2fd;hp=47fed91733443475bb84fbcf8ae72dd0c6097e88;hb=89ea3b1876d6a17a754c1f80c74f5076eccda866;hpb=44c79c1add4cd4a217b1dd77c8421c1d3a08dcef

diff --git a/test/test_speed.c b/test/test_speed.c
index 47fed91..458d765 100644
--- a/test/test_speed.c
+++ b/test/test_speed.c
@@ -685,26 +685,60 @@ test_speed_ec_inner(const char *name,
 }
 
 static void
-test_speed_ec_p256_i15(void)
+test_speed_ec_p256_m15(void)
 {
-	test_speed_ec_inner("EC i15/spec P-256",
-		&br_ec_p256_i15, &br_secp256r1);
+	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 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 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
@@ -793,10 +827,10 @@ test_speed_ecdsa_inner(const char *name,
 }
 
 static void
-test_speed_ecdsa_p256_i15(void)
+test_speed_ecdsa_p256_m15(void)
 {
-	test_speed_ecdsa_inner("ECDSA i15 P-256 (spec)",
-		&br_ec_p256_i15, &br_secp256r1,
+	test_speed_ecdsa_inner("ECDSA m15 P-256",
+		&br_ec_p256_m15, &br_secp256r1,
 		&br_ecdsa_i15_sign_asn1,
 		&br_ecdsa_i15_vrfy_asn1);
 }
@@ -1245,10 +1279,14 @@ static const struct {
 	STU(rsa_i15),
 	STU(rsa_i31),
 	STU(rsa_i32),
-	STU(ec_p256_i15),
 	STU(ec_prime_i15),
 	STU(ec_prime_i31),
-	STU(ecdsa_p256_i15),
+	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),