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

diff --git a/test/test_speed.c b/test/test_speed.c
index 458d765..0d440ff 100644
--- a/test/test_speed.c
+++ b/test/test_speed.c
@@ -691,6 +691,13 @@ test_speed_ec_p256_m15(void)
 		&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)
 {
@@ -835,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)
 {
@@ -869,120 +885,6 @@ test_speed_ecdsa_i31(void)
 		&br_ecdsa_i31_vrfy_asn1);
 }
 
-#if 0
-/* obsolete */
-static void
-test_speed_ec_prime_i31_inner(const char *name,
-	const unsigned char *bg, const br_ec_prime_i31_curve *cc)
-{
-	unsigned char bx[80], point[160];
-	uint32_t x[BR_EC_I31_LEN];
-	br_ec_prime_i31_jacobian P;
-	uint32_t xbl;
-	size_t plen;
-	int i;
-	long num;
-
-	xbl = cc->p[0];
-	xbl -= (xbl >> 5);
-	plen = (xbl + 7) >> 3;
-	memset(bx, 'T', sizeof bx);
-	br_i31_decode_reduce(x, bx, sizeof bx, cc->p);
-	br_i31_encode(bx, plen, x);
-	br_ec_prime_i31_decode(&P, bg, 1 + (plen << 1), cc);
-	for (i = 0; i < 10; i ++) {
-		br_ec_prime_i31_mul(&P, bx, plen, cc);
-		br_ec_prime_i31_encode(point, &P, cc);
-	}
-	num = 10;
-	for (;;) {
-		clock_t begin, end;
-		double tt;
-		long k;
-
-		begin = clock();
-		for (k = num; k > 0; k --) {
-			br_ec_prime_i31_mul(&P, bx, plen, cc);
-			br_ec_prime_i31_encode(point, &P, cc);
-		}
-		end = clock();
-		tt = (double)(end - begin) / CLOCKS_PER_SEC;
-		if (tt >= 2.0) {
-			printf("%-30s %8.2f mul/s\n", name,
-				(double)num / tt);
-			fflush(stdout);
-			break;
-		}
-		num <<= 1;
-	}
-}
-
-static void
-test_speed_ec_prime_i31(void)
-{
-	test_speed_ec_prime_i31_inner("EC i31 P-256",
-		br_g_secp256r1, &br_ec_prime_i31_secp256r1);
-	test_speed_ec_prime_i31_inner("EC i31 P-384",
-		br_g_secp384r1, &br_ec_prime_i31_secp384r1);
-	test_speed_ec_prime_i31_inner("EC i31 P-521",
-		br_g_secp521r1, &br_ec_prime_i31_secp521r1);
-}
-
-static void
-test_speed_ec_prime_i32_inner(const char *name,
-	const unsigned char *bg, const br_ec_prime_i32_curve *cc)
-{
-	unsigned char bx[80], point[160];
-	uint32_t x[BR_EC_I32_LEN];
-	br_ec_prime_i32_jacobian P;
-	size_t plen;
-	int i;
-	long num;
-
-	plen = (cc->p[0] + 7) >> 3;
-	memset(bx, 'T', sizeof bx);
-	br_i32_decode_reduce(x, bx, sizeof bx, cc->p);
-	br_i32_encode(bx, plen, x);
-	br_ec_prime_i32_decode(&P, bg, 1 + (plen << 1), cc);
-	for (i = 0; i < 10; i ++) {
-		br_ec_prime_i32_mul(&P, bx, plen, cc);
-		br_ec_prime_i32_encode(point, &P, cc);
-	}
-	num = 10;
-	for (;;) {
-		clock_t begin, end;
-		double tt;
-		long k;
-
-		begin = clock();
-		for (k = num; k > 0; k --) {
-			br_ec_prime_i32_mul(&P, bx, plen, cc);
-			br_ec_prime_i32_encode(point, &P, cc);
-		}
-		end = clock();
-		tt = (double)(end - begin) / CLOCKS_PER_SEC;
-		if (tt >= 2.0) {
-			printf("%-30s %8.2f mul/s\n", name,
-				(double)num / tt);
-			fflush(stdout);
-			break;
-		}
-		num <<= 1;
-	}
-}
-
-static void
-test_speed_ec_prime_i32(void)
-{
-	test_speed_ec_prime_i32_inner("EC i32 P-256",
-		br_g_secp256r1, &br_ec_prime_i32_secp256r1);
-	test_speed_ec_prime_i32_inner("EC i32 P-384",
-		br_g_secp384r1, &br_ec_prime_i32_secp384r1);
-	test_speed_ec_prime_i32_inner("EC i32 P-521",
-		br_g_secp521r1, &br_ec_prime_i32_secp521r1);
-}
-#endif
-
 static void
 test_speed_i31(void)
 {
@@ -1282,11 +1184,13 @@ static const struct {
 	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),