X-Git-Url: https://www.bearssl.org/gitweb//home/git/?p=BearSSL;a=blobdiff_plain;f=test%2Ftest_speed.c;h=db65edc9a7c88bd027256197a4143e4e0bbe66a5;hp=48c2fdbad99d06af6b825481332cf39833d7035b;hb=bd3036844bd20b2b8d7bce7fee5ad010ce401915;hpb=693d2a0085f4c1d289cb6d79c02ddd23f18d9478

diff --git a/test/test_speed.c b/test/test_speed.c
index 48c2fdb..db65edc 100644
--- a/test/test_speed.c
+++ b/test/test_speed.c
@@ -687,40 +687,67 @@ 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_p256_m31(void)
+{
+	test_speed_ec_inner("EC p256_m31",
+		&br_ec_p256_m31, &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,
@@ -815,6 +842,15 @@ test_speed_ecdsa_p256_m15(void)
 		&br_ecdsa_i15_vrfy_asn1);
 }
 
+static void
+test_speed_ecdsa_p256_m31(void)
+{
+	test_speed_ecdsa_inner("ECDSA m31 P-256",
+		&br_ec_p256_m31, &br_secp256r1,
+		&br_ecdsa_i31_sign_asn1,
+		&br_ecdsa_i31_vrfy_asn1);
+}
+
 static void
 test_speed_ecdsa_i15(void)
 {
@@ -1259,12 +1295,16 @@ 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_p256_m31),
 	STU(ec_c25519_i15),
+	STU(ec_c25519_i31),
 	STU(ec_c25519_m15),
+	STU(ec_c25519_m31),
 	STU(ecdsa_p256_m15),
+	STU(ecdsa_p256_m31),
 	STU(ecdsa_i15),
 	STU(ecdsa_i31),