Merge pull request #465 from libtom/pr/ecc-test-cleanup

karel-m · web-flow · commit d432b13139ce · 2018-11-07T13:35:57.000+01:00
ecc_test cleanup
diff --git a/libtomcrypt_VS2008.vcproj b/libtomcrypt_VS2008.vcproj
@@ -2410,10 +2410,6 @@
 					RelativePath="src\pk\ecc\ecc_ssh_ecdsa_encode_name.c"
 					>
 				</File>
-				<File
-					RelativePath="src\pk\ecc\ecc_test.c"
-					>
-				</File>
 				<File
 					RelativePath="src\pk\ecc\ecc_verify_hash.c"
 					>
diff --git a/makefile.mingw b/makefile.mingw
@@ -186,8 +186,8 @@ src/pk/ecc/ecc_import.o src/pk/ecc/ecc_import_openssl.o src/pk/ecc/ecc_import_pk
 src/pk/ecc/ecc_import_x509.o src/pk/ecc/ecc_make_key.o src/pk/ecc/ecc_recover_key.o \
 src/pk/ecc/ecc_set_curve.o src/pk/ecc/ecc_set_curve_internal.o src/pk/ecc/ecc_set_key.o \
 src/pk/ecc/ecc_shared_secret.o src/pk/ecc/ecc_sign_hash.o src/pk/ecc/ecc_sizes.o \
-src/pk/ecc/ecc_ssh_ecdsa_encode_name.o src/pk/ecc/ecc_test.o src/pk/ecc/ecc_verify_hash.o \
-src/pk/ecc/ltc_ecc_export_point.o src/pk/ecc/ltc_ecc_import_point.o src/pk/ecc/ltc_ecc_is_point.o \
+src/pk/ecc/ecc_ssh_ecdsa_encode_name.o src/pk/ecc/ecc_verify_hash.o src/pk/ecc/ltc_ecc_export_point.o \
+src/pk/ecc/ltc_ecc_import_point.o src/pk/ecc/ltc_ecc_is_point.o \
 src/pk/ecc/ltc_ecc_is_point_at_infinity.o src/pk/ecc/ltc_ecc_map.o src/pk/ecc/ltc_ecc_mul2add.o \
 src/pk/ecc/ltc_ecc_mulmod.o src/pk/ecc/ltc_ecc_mulmod_timing.o src/pk/ecc/ltc_ecc_points.o \
 src/pk/ecc/ltc_ecc_projective_add_point.o src/pk/ecc/ltc_ecc_projective_dbl_point.o \
diff --git a/makefile.msvc b/makefile.msvc
@@ -179,8 +179,8 @@ src/pk/ecc/ecc_import.obj src/pk/ecc/ecc_import_openssl.obj src/pk/ecc/ecc_impor
 src/pk/ecc/ecc_import_x509.obj src/pk/ecc/ecc_make_key.obj src/pk/ecc/ecc_recover_key.obj \
 src/pk/ecc/ecc_set_curve.obj src/pk/ecc/ecc_set_curve_internal.obj src/pk/ecc/ecc_set_key.obj \
 src/pk/ecc/ecc_shared_secret.obj src/pk/ecc/ecc_sign_hash.obj src/pk/ecc/ecc_sizes.obj \
-src/pk/ecc/ecc_ssh_ecdsa_encode_name.obj src/pk/ecc/ecc_test.obj src/pk/ecc/ecc_verify_hash.obj \
-src/pk/ecc/ltc_ecc_export_point.obj src/pk/ecc/ltc_ecc_import_point.obj src/pk/ecc/ltc_ecc_is_point.obj \
+src/pk/ecc/ecc_ssh_ecdsa_encode_name.obj src/pk/ecc/ecc_verify_hash.obj src/pk/ecc/ltc_ecc_export_point.obj \
+src/pk/ecc/ltc_ecc_import_point.obj src/pk/ecc/ltc_ecc_is_point.obj \
 src/pk/ecc/ltc_ecc_is_point_at_infinity.obj src/pk/ecc/ltc_ecc_map.obj src/pk/ecc/ltc_ecc_mul2add.obj \
 src/pk/ecc/ltc_ecc_mulmod.obj src/pk/ecc/ltc_ecc_mulmod_timing.obj src/pk/ecc/ltc_ecc_points.obj \
 src/pk/ecc/ltc_ecc_projective_add_point.obj src/pk/ecc/ltc_ecc_projective_dbl_point.obj \
diff --git a/makefile.unix b/makefile.unix
@@ -196,8 +196,8 @@ src/pk/ecc/ecc_import.o src/pk/ecc/ecc_import_openssl.o src/pk/ecc/ecc_import_pk
 src/pk/ecc/ecc_import_x509.o src/pk/ecc/ecc_make_key.o src/pk/ecc/ecc_recover_key.o \
 src/pk/ecc/ecc_set_curve.o src/pk/ecc/ecc_set_curve_internal.o src/pk/ecc/ecc_set_key.o \
 src/pk/ecc/ecc_shared_secret.o src/pk/ecc/ecc_sign_hash.o src/pk/ecc/ecc_sizes.o \
-src/pk/ecc/ecc_ssh_ecdsa_encode_name.o src/pk/ecc/ecc_test.o src/pk/ecc/ecc_verify_hash.o \
-src/pk/ecc/ltc_ecc_export_point.o src/pk/ecc/ltc_ecc_import_point.o src/pk/ecc/ltc_ecc_is_point.o \
+src/pk/ecc/ecc_ssh_ecdsa_encode_name.o src/pk/ecc/ecc_verify_hash.o src/pk/ecc/ltc_ecc_export_point.o \
+src/pk/ecc/ltc_ecc_import_point.o src/pk/ecc/ltc_ecc_is_point.o \
 src/pk/ecc/ltc_ecc_is_point_at_infinity.o src/pk/ecc/ltc_ecc_map.o src/pk/ecc/ltc_ecc_mul2add.o \
 src/pk/ecc/ltc_ecc_mulmod.o src/pk/ecc/ltc_ecc_mulmod_timing.o src/pk/ecc/ltc_ecc_points.o \
 src/pk/ecc/ltc_ecc_projective_add_point.o src/pk/ecc/ltc_ecc_projective_dbl_point.o \
diff --git a/makefile_include.mk b/makefile_include.mk
@@ -356,8 +356,8 @@ src/pk/ecc/ecc_import.o src/pk/ecc/ecc_import_openssl.o src/pk/ecc/ecc_import_pk
 src/pk/ecc/ecc_import_x509.o src/pk/ecc/ecc_make_key.o src/pk/ecc/ecc_recover_key.o \
 src/pk/ecc/ecc_set_curve.o src/pk/ecc/ecc_set_curve_internal.o src/pk/ecc/ecc_set_key.o \
 src/pk/ecc/ecc_shared_secret.o src/pk/ecc/ecc_sign_hash.o src/pk/ecc/ecc_sizes.o \
-src/pk/ecc/ecc_ssh_ecdsa_encode_name.o src/pk/ecc/ecc_test.o src/pk/ecc/ecc_verify_hash.o \
-src/pk/ecc/ltc_ecc_export_point.o src/pk/ecc/ltc_ecc_import_point.o src/pk/ecc/ltc_ecc_is_point.o \
+src/pk/ecc/ecc_ssh_ecdsa_encode_name.o src/pk/ecc/ecc_verify_hash.o src/pk/ecc/ltc_ecc_export_point.o \
+src/pk/ecc/ltc_ecc_import_point.o src/pk/ecc/ltc_ecc_is_point.o \
 src/pk/ecc/ltc_ecc_is_point_at_infinity.o src/pk/ecc/ltc_ecc_map.o src/pk/ecc/ltc_ecc_mul2add.o \
 src/pk/ecc/ltc_ecc_mulmod.o src/pk/ecc/ltc_ecc_mulmod_timing.o src/pk/ecc/ltc_ecc_points.o \
 src/pk/ecc/ltc_ecc_projective_add_point.o src/pk/ecc/ltc_ecc_projective_dbl_point.o \
diff --git a/src/headers/tomcrypt_pk.h b/src/headers/tomcrypt_pk.h
@@ -259,7 +259,6 @@ typedef enum ecc_signature_type_ {
 /** the ECC params provided */
 extern const ltc_ecc_curve ltc_ecc_curves[];
 
-int  ecc_test(void);
 void ecc_sizes(int *low, int *high);
 int  ecc_get_size(const ecc_key *key);
 
diff --git a/src/pk/ecc/ecc_test.c b/src/pk/ecc/ecc_test.c
diff --git a/tests/ecc_test.c b/tests/ecc_test.c
@@ -1590,7 +1590,7 @@ static int _ecc_test_recovery(void)
 }
 #endif
 
-int ecc_tests(void)
+int ecc_test(void)
 {
    if (ltc_mp.name == NULL) return CRYPT_NOP;
 
diff --git a/tests/test.c b/tests/test.c
@@ -36,7 +36,7 @@ static const test_function test_functions[] =
       LTC_TEST_FN(pkcs_1_eme_test),
       LTC_TEST_FN(rsa_test),
       LTC_TEST_FN(dh_test),
-      LTC_TEST_FN(ecc_tests),
+      LTC_TEST_FN(ecc_test),
       LTC_TEST_FN(dsa_test),
       LTC_TEST_FN(file_test),
       LTC_TEST_FN(multi_test),
diff --git a/tests/tomcrypt_test.h b/tests/tomcrypt_test.h
@@ -32,7 +32,7 @@ int store_test(void);
 int rotate_test(void);
 int rsa_test(void);
 int dh_test(void);
-int ecc_tests(void);
+int ecc_test(void);
 int dsa_test(void);
 int der_test(void);
 int misc_test(void);

Original file line number	Diff line number	Diff line change
`@@ -2410,10 +2410,6 @@`
`2410`	`2410`	`RelativePath="src\pk\ecc\ecc_ssh_ecdsa_encode_name.c"`
`2411`	`2411`	`>`
`2412`	`2412`	`</File>`
`2413`		`- <File`
`2414`		`- RelativePath="src\pk\ecc\ecc_test.c"`
`2415`		`- >`
`2416`		`- </File>`
`2417`	`2413`	`<File`
`2418`	`2414`	`RelativePath="src\pk\ecc\ecc_verify_hash.c"`
`2419`	`2415`	`>`
Original file line number	Diff line number	Diff line change
`@@ -1590,7 +1590,7 @@ static int _ecc_test_recovery(void)`
`1590`	`1590`	`}`
`1591`	`1591`	`#endif`
`1592`	`1592`
`1593`		`-int ecc_tests(void)`
	`1593`	`+int ecc_test(void)`
`1594`	`1594`	`{`
`1595`	`1595`	`if (ltc_mp.name == NULL) return CRYPT_NOP;`
`1596`	`1596`