Rename speed functions

guanzhi · Jun 5, 2024 · 2b09618 · 2b09618
1 parent b0348be
commit 2b09618
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/tests/sm2_enctest.c b/tests/sm2_enctest.c
@@ -219,7 +219,6 @@ static int test_sm2_encrypt_fixlen(void)
 				error_print();
 				return -1;
 			}
-			printf("plaintext len = %zu, ciphertext len = %zu\n", tests[i].plaintext_len, encrypted_len);
 			if (encrypted_len != encrypted_fixlen) {
 				error_print();
 				return -1;
@@ -282,7 +281,7 @@ static int test_sm2_encrypt(void)
 	return 1;
 }
 
-static int test_sm2_encrypt_ctx_speed(void)
+static int speed_sm2_encrypt_ctx(void)
 {
 	SM2_KEY sm2_key;
 	SM2_ENC_CTX enc_ctx;
@@ -327,7 +326,9 @@ int main(void)
 	if (test_sm2_do_encrypt_fixlen() != 1) goto err;
 	if (test_sm2_encrypt() != 1) goto err;
 	if (test_sm2_encrypt_fixlen() != 1) goto err;
-	if (test_sm2_encrypt_ctx_speed() != 1) goto err;
+#if ENABLE_TEST_SPEED
+	if (speed_sm2_encrypt_ctx() != 1) goto err;
+#endif
 	printf("%s all tests passed\n", __FILE__);
 	return 0;
 err:

diff --git a/tests/sm2_signtest.c b/tests/sm2_signtest.c
@@ -172,7 +172,7 @@ static int test_sm2_sign(void)
 	return 1;
 }
 
-static int test_sm2_sign_ctx_speed(void)
+static int speed_sm2_sign_ctx(void)
 {
 	SM2_KEY sm2_key;
 	SM2_SIGN_CTX sign_ctx;
@@ -205,13 +205,10 @@ static int test_sm2_sign_ctx_speed(void)
 		sm2_sign_reset(&sign_ctx);
 	}
 	end = clock();
-
 	seconds = (double)(end - start)/CLOCKS_PER_SEC;
 
-	fprintf(stderr, "sm2_sign_ctx speed : 4096 signs time %f seconds, %f signs per second\n", seconds, 4096/seconds);
-
+	printf("%s: %f signs per second\n", __FUNCTION__, 4096/seconds);
 	return 1;
-
 }
 
 static int test_sm2_sign_ctx(void)
@@ -340,7 +337,9 @@ int main(void)
 	if (test_sm2_sign() != 1) goto err;
 	if (test_sm2_sign_ctx() != 1) goto err;
 	if (test_sm2_sign_reset() != 1) goto err;
-	if (test_sm2_sign_ctx_speed() != 1) goto err;
+#if ENABLE_TEST_SPEED
+	if (speed_sm2_sign_ctx() != 1) goto err;
+#endif
 	printf("%s all tests passed\n", __FILE__);
 	return 0;
 err:

diff --git a/tests/sm3test.c b/tests/sm3test.c
@@ -176,7 +176,7 @@ static int test_sm3(void)
 	return 1;
 }
 
-static int test_sm3_speed(void)
+static int speed_sm3(void)
 {
 	SM3_CTX sm3_ctx;
 	uint8_t blocks[4096];
@@ -198,7 +198,7 @@ static int test_sm3_speed(void)
 
 	seconds = (double)(end - start)/CLOCKS_PER_SEC;
 
-	fprintf(stderr, "%s: %f MiB per second\n", __FUNCTION__, 16/seconds);
+	printf("%s: %f MiB per second\n", __FUNCTION__, 16/seconds);
 	return 1;
 }
 
@@ -207,7 +207,7 @@ int main(void)
 {
 	if (test_sm3() != 1) goto err;
 #if ENABLE_TEST_SPEED
-	if (test_sm3_speed() != 1) goto err;
+	if (speed_sm3() != 1) goto err;
 #endif
 	printf("%s all tests passed\n", __FILE__);
 	return 0;