Browse Source

ecc_test cleanup

Karel Miko 7 years ago
parent
commit
ae2ab2083b
5 changed files with 3 additions and 36 deletions
  1. 0 1
      src/headers/tomcrypt_pk.h
  2. 0 32
      src/pk/ecc/ecc_test.c
  3. 1 1
      tests/ecc_test.c
  4. 1 1
      tests/test.c
  5. 1 1
      tests/tomcrypt_test.h

+ 0 - 1
src/headers/tomcrypt_pk.h

@@ -259,7 +259,6 @@ typedef enum ecc_signature_type_ {
 /** the ECC params provided */
 /** the ECC params provided */
 extern const ltc_ecc_curve ltc_ecc_curves[];
 extern const ltc_ecc_curve ltc_ecc_curves[];
 
 
-int  ecc_test(void);
 void ecc_sizes(int *low, int *high);
 void ecc_sizes(int *low, int *high);
 int  ecc_get_size(const ecc_key *key);
 int  ecc_get_size(const ecc_key *key);
 
 

+ 0 - 32
src/pk/ecc/ecc_test.c

@@ -1,32 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- */
-
-#include "tomcrypt_private.h"
-
-/**
-  @file ecc_test.c
-  ECC Crypto, Tom St Denis
-*/
-
-#ifdef LTC_MECC
-
-int ecc_test(void)
-{
-   /* the main ECC tests are in tests/ecc_test.c
-    * this function is kept just for API compatibility
-    */
-   return CRYPT_NOP;
-}
-
-#endif
-
-/* ref:         $Format:%D$ */
-/* git commit:  $Format:%H$ */
-/* commit time: $Format:%ai$ */
-

+ 1 - 1
tests/ecc_test.c

@@ -1590,7 +1590,7 @@ static int _ecc_test_recovery(void)
 }
 }
 #endif
 #endif
 
 
-int ecc_tests(void)
+int ecc_test(void)
 {
 {
    if (ltc_mp.name == NULL) return CRYPT_NOP;
    if (ltc_mp.name == NULL) return CRYPT_NOP;
 
 

+ 1 - 1
tests/test.c

@@ -36,7 +36,7 @@ static const test_function test_functions[] =
       LTC_TEST_FN(pkcs_1_eme_test),
       LTC_TEST_FN(pkcs_1_eme_test),
       LTC_TEST_FN(rsa_test),
       LTC_TEST_FN(rsa_test),
       LTC_TEST_FN(dh_test),
       LTC_TEST_FN(dh_test),
-      LTC_TEST_FN(ecc_tests),
+      LTC_TEST_FN(ecc_test),
       LTC_TEST_FN(dsa_test),
       LTC_TEST_FN(dsa_test),
       LTC_TEST_FN(file_test),
       LTC_TEST_FN(file_test),
       LTC_TEST_FN(multi_test),
       LTC_TEST_FN(multi_test),

+ 1 - 1
tests/tomcrypt_test.h

@@ -32,7 +32,7 @@ int store_test(void);
 int rotate_test(void);
 int rotate_test(void);
 int rsa_test(void);
 int rsa_test(void);
 int dh_test(void);
 int dh_test(void);
-int ecc_tests(void);
+int ecc_test(void);
 int dsa_test(void);
 int dsa_test(void);
 int der_test(void);
 int der_test(void);
 int misc_test(void);
 int misc_test(void);