Skip to content

Commit d3c5890

Browse files
karel-mkarel-m
authored
Merge pull request #423 from libtom/pr/ecc_set_dp--ecc_set_curve
rename ecc_set_dp >> ecc_set_curve + ecc_get_curve >> ecc_find_curve
2 parents 4473953 + 4bec98f commit d3c5890

19 files changed

+73
-73
lines changed

‎libtomcrypt_VS2008.vcproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2283,11 +2283,11 @@
22832283
>
22842284
</File>
22852285
<File
2286-
RelativePath="src\pk\ecc\ecc_free.c"
2286+
RelativePath="src\pk\ecc\ecc_find_curve.c"
22872287
>
22882288
</File>
22892289
<File
2290-
RelativePath="src\pk\ecc\ecc_get_curve.c"
2290+
RelativePath="src\pk\ecc\ecc_free.c"
22912291
>
22922292
</File>
22932293
<File
@@ -2319,11 +2319,11 @@
23192319
>
23202320
</File>
23212321
<File
2322-
RelativePath="src\pk\ecc\ecc_set_dp.c"
2322+
RelativePath="src\pk\ecc\ecc_set_curve.c"
23232323
>
23242324
</File>
23252325
<File
2326-
RelativePath="src\pk\ecc\ecc_set_dp_internal.c"
2326+
RelativePath="src\pk\ecc\ecc_set_curve_internal.c"
23272327
>
23282328
</File>
23292329
<File

‎makefile.mingw

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -177,12 +177,12 @@ src/pk/dsa/dsa_make_key.o src/pk/dsa/dsa_set.o src/pk/dsa/dsa_set_pqg_dsaparam.o
177177
src/pk/dsa/dsa_shared_secret.o src/pk/dsa/dsa_sign_hash.o src/pk/dsa/dsa_verify_hash.o \
178178
src/pk/dsa/dsa_verify_key.o src/pk/ecc/ecc.o src/pk/ecc/ecc_ansi_x963_export.o \
179179
src/pk/ecc/ecc_ansi_x963_import.o src/pk/ecc/ecc_decrypt_key.o src/pk/ecc/ecc_encrypt_key.o \
180-
src/pk/ecc/ecc_export.o src/pk/ecc/ecc_export_openssl.o src/pk/ecc/ecc_free.o \
181-
src/pk/ecc/ecc_get_curve.o src/pk/ecc/ecc_get_key.o src/pk/ecc/ecc_get_oid_str.o \
182-
src/pk/ecc/ecc_get_size.o src/pk/ecc/ecc_import.o src/pk/ecc/ecc_import_openssl.o \
183-
src/pk/ecc/ecc_import_x509.o src/pk/ecc/ecc_make_key.o src/pk/ecc/ecc_set_dp.o \
184-
src/pk/ecc/ecc_set_dp_internal.o src/pk/ecc/ecc_set_key.o src/pk/ecc/ecc_shared_secret.o \
185-
src/pk/ecc/ecc_sign_hash.o src/pk/ecc/ecc_sizes.o src/pk/ecc/ecc_test.o src/pk/ecc/ecc_verify_hash.o \
180+
src/pk/ecc/ecc_export.o src/pk/ecc/ecc_export_openssl.o src/pk/ecc/ecc_find_curve.o \
181+
src/pk/ecc/ecc_free.o src/pk/ecc/ecc_get_key.o src/pk/ecc/ecc_get_oid_str.o src/pk/ecc/ecc_get_size.o \
182+
src/pk/ecc/ecc_import.o src/pk/ecc/ecc_import_openssl.o src/pk/ecc/ecc_import_x509.o \
183+
src/pk/ecc/ecc_make_key.o src/pk/ecc/ecc_set_curve.o src/pk/ecc/ecc_set_curve_internal.o \
184+
src/pk/ecc/ecc_set_key.o src/pk/ecc/ecc_shared_secret.o src/pk/ecc/ecc_sign_hash.o \
185+
src/pk/ecc/ecc_sizes.o src/pk/ecc/ecc_test.o src/pk/ecc/ecc_verify_hash.o \
186186
src/pk/ecc/ltc_ecc_export_point.o src/pk/ecc/ltc_ecc_import_point.o src/pk/ecc/ltc_ecc_is_point.o \
187187
src/pk/ecc/ltc_ecc_is_point_at_infinity.o src/pk/ecc/ltc_ecc_map.o src/pk/ecc/ltc_ecc_mul2add.o \
188188
src/pk/ecc/ltc_ecc_mulmod.o src/pk/ecc/ltc_ecc_mulmod_timing.o src/pk/ecc/ltc_ecc_points.o \

‎makefile.msvc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -170,12 +170,12 @@ src/pk/dsa/dsa_make_key.obj src/pk/dsa/dsa_set.obj src/pk/dsa/dsa_set_pqg_dsapar
170170
src/pk/dsa/dsa_shared_secret.obj src/pk/dsa/dsa_sign_hash.obj src/pk/dsa/dsa_verify_hash.obj \
171171
src/pk/dsa/dsa_verify_key.obj src/pk/ecc/ecc.obj src/pk/ecc/ecc_ansi_x963_export.obj \
172172
src/pk/ecc/ecc_ansi_x963_import.obj src/pk/ecc/ecc_decrypt_key.obj src/pk/ecc/ecc_encrypt_key.obj \
173-
src/pk/ecc/ecc_export.obj src/pk/ecc/ecc_export_openssl.obj src/pk/ecc/ecc_free.obj \
174-
src/pk/ecc/ecc_get_curve.obj src/pk/ecc/ecc_get_key.obj src/pk/ecc/ecc_get_oid_str.obj \
175-
src/pk/ecc/ecc_get_size.obj src/pk/ecc/ecc_import.obj src/pk/ecc/ecc_import_openssl.obj \
176-
src/pk/ecc/ecc_import_x509.obj src/pk/ecc/ecc_make_key.obj src/pk/ecc/ecc_set_dp.obj \
177-
src/pk/ecc/ecc_set_dp_internal.obj src/pk/ecc/ecc_set_key.obj src/pk/ecc/ecc_shared_secret.obj \
178-
src/pk/ecc/ecc_sign_hash.obj src/pk/ecc/ecc_sizes.obj src/pk/ecc/ecc_test.obj src/pk/ecc/ecc_verify_hash.obj \
173+
src/pk/ecc/ecc_export.obj src/pk/ecc/ecc_export_openssl.obj src/pk/ecc/ecc_find_curve.obj \
174+
src/pk/ecc/ecc_free.obj src/pk/ecc/ecc_get_key.obj src/pk/ecc/ecc_get_oid_str.obj src/pk/ecc/ecc_get_size.obj \
175+
src/pk/ecc/ecc_import.obj src/pk/ecc/ecc_import_openssl.obj src/pk/ecc/ecc_import_x509.obj \
176+
src/pk/ecc/ecc_make_key.obj src/pk/ecc/ecc_set_curve.obj src/pk/ecc/ecc_set_curve_internal.obj \
177+
src/pk/ecc/ecc_set_key.obj src/pk/ecc/ecc_shared_secret.obj src/pk/ecc/ecc_sign_hash.obj \
178+
src/pk/ecc/ecc_sizes.obj src/pk/ecc/ecc_test.obj src/pk/ecc/ecc_verify_hash.obj \
179179
src/pk/ecc/ltc_ecc_export_point.obj src/pk/ecc/ltc_ecc_import_point.obj src/pk/ecc/ltc_ecc_is_point.obj \
180180
src/pk/ecc/ltc_ecc_is_point_at_infinity.obj src/pk/ecc/ltc_ecc_map.obj src/pk/ecc/ltc_ecc_mul2add.obj \
181181
src/pk/ecc/ltc_ecc_mulmod.obj src/pk/ecc/ltc_ecc_mulmod_timing.obj src/pk/ecc/ltc_ecc_points.obj \

‎makefile.unix

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -187,12 +187,12 @@ src/pk/dsa/dsa_make_key.o src/pk/dsa/dsa_set.o src/pk/dsa/dsa_set_pqg_dsaparam.o
187187
src/pk/dsa/dsa_shared_secret.o src/pk/dsa/dsa_sign_hash.o src/pk/dsa/dsa_verify_hash.o \
188188
src/pk/dsa/dsa_verify_key.o src/pk/ecc/ecc.o src/pk/ecc/ecc_ansi_x963_export.o \
189189
src/pk/ecc/ecc_ansi_x963_import.o src/pk/ecc/ecc_decrypt_key.o src/pk/ecc/ecc_encrypt_key.o \
190-
src/pk/ecc/ecc_export.o src/pk/ecc/ecc_export_openssl.o src/pk/ecc/ecc_free.o \
191-
src/pk/ecc/ecc_get_curve.o src/pk/ecc/ecc_get_key.o src/pk/ecc/ecc_get_oid_str.o \
192-
src/pk/ecc/ecc_get_size.o src/pk/ecc/ecc_import.o src/pk/ecc/ecc_import_openssl.o \
193-
src/pk/ecc/ecc_import_x509.o src/pk/ecc/ecc_make_key.o src/pk/ecc/ecc_set_dp.o \
194-
src/pk/ecc/ecc_set_dp_internal.o src/pk/ecc/ecc_set_key.o src/pk/ecc/ecc_shared_secret.o \
195-
src/pk/ecc/ecc_sign_hash.o src/pk/ecc/ecc_sizes.o src/pk/ecc/ecc_test.o src/pk/ecc/ecc_verify_hash.o \
190+
src/pk/ecc/ecc_export.o src/pk/ecc/ecc_export_openssl.o src/pk/ecc/ecc_find_curve.o \
191+
src/pk/ecc/ecc_free.o src/pk/ecc/ecc_get_key.o src/pk/ecc/ecc_get_oid_str.o src/pk/ecc/ecc_get_size.o \
192+
src/pk/ecc/ecc_import.o src/pk/ecc/ecc_import_openssl.o src/pk/ecc/ecc_import_x509.o \
193+
src/pk/ecc/ecc_make_key.o src/pk/ecc/ecc_set_curve.o src/pk/ecc/ecc_set_curve_internal.o \
194+
src/pk/ecc/ecc_set_key.o src/pk/ecc/ecc_shared_secret.o src/pk/ecc/ecc_sign_hash.o \
195+
src/pk/ecc/ecc_sizes.o src/pk/ecc/ecc_test.o src/pk/ecc/ecc_verify_hash.o \
196196
src/pk/ecc/ltc_ecc_export_point.o src/pk/ecc/ltc_ecc_import_point.o src/pk/ecc/ltc_ecc_is_point.o \
197197
src/pk/ecc/ltc_ecc_is_point_at_infinity.o src/pk/ecc/ltc_ecc_map.o src/pk/ecc/ltc_ecc_mul2add.o \
198198
src/pk/ecc/ltc_ecc_mulmod.o src/pk/ecc/ltc_ecc_mulmod_timing.o src/pk/ecc/ltc_ecc_points.o \

‎makefile_include.mk

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -347,12 +347,12 @@ src/pk/dsa/dsa_make_key.o src/pk/dsa/dsa_set.o src/pk/dsa/dsa_set_pqg_dsaparam.o
347347
src/pk/dsa/dsa_shared_secret.o src/pk/dsa/dsa_sign_hash.o src/pk/dsa/dsa_verify_hash.o \
348348
src/pk/dsa/dsa_verify_key.o src/pk/ecc/ecc.o src/pk/ecc/ecc_ansi_x963_export.o \
349349
src/pk/ecc/ecc_ansi_x963_import.o src/pk/ecc/ecc_decrypt_key.o src/pk/ecc/ecc_encrypt_key.o \
350-
src/pk/ecc/ecc_export.o src/pk/ecc/ecc_export_openssl.o src/pk/ecc/ecc_free.o \
351-
src/pk/ecc/ecc_get_curve.o src/pk/ecc/ecc_get_key.o src/pk/ecc/ecc_get_oid_str.o \
352-
src/pk/ecc/ecc_get_size.o src/pk/ecc/ecc_import.o src/pk/ecc/ecc_import_openssl.o \
353-
src/pk/ecc/ecc_import_x509.o src/pk/ecc/ecc_make_key.o src/pk/ecc/ecc_set_dp.o \
354-
src/pk/ecc/ecc_set_dp_internal.o src/pk/ecc/ecc_set_key.o src/pk/ecc/ecc_shared_secret.o \
355-
src/pk/ecc/ecc_sign_hash.o src/pk/ecc/ecc_sizes.o src/pk/ecc/ecc_test.o src/pk/ecc/ecc_verify_hash.o \
350+
src/pk/ecc/ecc_export.o src/pk/ecc/ecc_export_openssl.o src/pk/ecc/ecc_find_curve.o \
351+
src/pk/ecc/ecc_free.o src/pk/ecc/ecc_get_key.o src/pk/ecc/ecc_get_oid_str.o src/pk/ecc/ecc_get_size.o \
352+
src/pk/ecc/ecc_import.o src/pk/ecc/ecc_import_openssl.o src/pk/ecc/ecc_import_x509.o \
353+
src/pk/ecc/ecc_make_key.o src/pk/ecc/ecc_set_curve.o src/pk/ecc/ecc_set_curve_internal.o \
354+
src/pk/ecc/ecc_set_key.o src/pk/ecc/ecc_shared_secret.o src/pk/ecc/ecc_sign_hash.o \
355+
src/pk/ecc/ecc_sizes.o src/pk/ecc/ecc_test.o src/pk/ecc/ecc_verify_hash.o \
356356
src/pk/ecc/ltc_ecc_export_point.o src/pk/ecc/ltc_ecc_import_point.o src/pk/ecc/ltc_ecc_is_point.o \
357357
src/pk/ecc/ltc_ecc_is_point_at_infinity.o src/pk/ecc/ltc_ecc_map.o src/pk/ecc/ltc_ecc_mul2add.o \
358358
src/pk/ecc/ltc_ecc_mulmod.o src/pk/ecc/ltc_ecc_mulmod_timing.o src/pk/ecc/ltc_ecc_points.o \

‎src/headers/tomcrypt_pk.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,8 +251,8 @@ int ecc_test(void);
251251
void ecc_sizes(int *low, int *high);
252252
int ecc_get_size(const ecc_key *key);
253253

254-
int ecc_get_curve(const char* name_or_oid, const ltc_ecc_curve** cu);
255-
int ecc_set_dp(const ltc_ecc_curve *cu, ecc_key *key);
254+
int ecc_find_curve(const char* name_or_oid, const ltc_ecc_curve** cu);
255+
int ecc_set_curve(const ltc_ecc_curve *cu, ecc_key *key);
256256
int ecc_generate_key(prng_state *prng, int wprng, ecc_key *key);
257257
int ecc_set_key(const unsigned char *in, unsigned long inlen, int type, ecc_key *key);
258258
int ecc_get_key(unsigned char *out, unsigned long *outlen, int type, const ecc_key *key);

‎src/headers/tomcrypt_private.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,9 +192,9 @@ int dh_check_pubkey(const dh_key *key);
192192

193193
/* ---- ECC Routines ---- */
194194
#ifdef LTC_MECC
195-
int ecc_set_dp_from_mpis(void *a, void *b, void *prime, void *order, void *gx, void *gy, unsigned long cofactor, ecc_key *key);
196-
int ecc_copy_dp(const ecc_key *srckey, ecc_key *key);
197-
int ecc_set_dp_by_size(int size, ecc_key *key);
195+
int ecc_set_curve_from_mpis(void *a, void *b, void *prime, void *order, void *gx, void *gy, unsigned long cofactor, ecc_key *key);
196+
int ecc_copy_curve(const ecc_key *srckey, ecc_key *key);
197+
int ecc_set_curve_by_size(int size, ecc_key *key);
198198
int ecc_import_subject_public_key_info(const unsigned char *in, unsigned long inlen, ecc_key *key);
199199

200200
/* low level functions */

‎src/pk/ecc/ecc_ansi_x963_import.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ int ecc_ansi_x963_import_ex(const unsigned char *in, unsigned long inlen, ecc_ke
4141
/* initialize key->dp */
4242
if (cu == NULL) {
4343
/* this case works only for uncompressed public keys */
44-
if ((err = ecc_set_dp_by_size((inlen-1)>>1, key)) != CRYPT_OK) { return err; }
44+
if ((err = ecc_set_curve_by_size((inlen-1)>>1, key)) != CRYPT_OK) { return err; }
4545
}
4646
else {
4747
/* this one works for both compressed / uncompressed pubkeys */
48-
if ((err = ecc_set_dp(cu, key)) != CRYPT_OK) { return err; }
48+
if ((err = ecc_set_curve(cu, key)) != CRYPT_OK) { return err; }
4949
}
5050

5151
/* load public key */

‎src/pk/ecc/ecc_decrypt_key.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ int ecc_decrypt_key(const unsigned char *in, unsigned long inlen,
8585
}
8686

8787
/* import ECC key from packet */
88-
if ((err = ecc_copy_dp(key, &pubkey)) != CRYPT_OK) { goto LBL_ERR; }
88+
if ((err = ecc_copy_curve(key, &pubkey)) != CRYPT_OK) { goto LBL_ERR; }
8989
if ((err = ecc_set_key(decode[1].data, decode[1].size, PK_PUBLIC, &pubkey)) != CRYPT_OK) { goto LBL_ERR; }
9090

9191
/* make shared key */

‎src/pk/ecc/ecc_encrypt_key.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ int ecc_encrypt_key(const unsigned char *in, unsigned long inlen,
5252
}
5353

5454
/* make a random key and export the public copy */
55-
if ((err = ecc_copy_dp(key, &pubkey)) != CRYPT_OK) { return err; }
55+
if ((err = ecc_copy_curve(key, &pubkey)) != CRYPT_OK) { return err; }
5656
if ((err = ecc_generate_key(prng, wprng, &pubkey)) != CRYPT_OK) { return err; }
5757

5858
pub_expt = XMALLOC(ECC_BUF_SIZE);

‎src/pk/ecc/ecc_get_curve.c renamed to ‎src/pk/ecc/ecc_find_curve.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ static int _name_match(const char *left, const char *right)
212212
return 0;
213213
}
214214

215-
int ecc_get_curve(const char *name_or_oid, const ltc_ecc_curve **cu)
215+
int ecc_find_curve(const char *name_or_oid, const ltc_ecc_curve **cu)
216216
{
217217
int i, j;
218218
const char *OID = NULL;

‎src/pk/ecc/ecc_import.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ int ecc_import_ex(const unsigned char *in, unsigned long inlen, ecc_key *key, co
5656

5757
/* allocate & initialize the key */
5858
if (cu == NULL) {
59-
if ((err = ecc_set_dp_by_size(key_size, key)) != CRYPT_OK) { goto done; }
59+
if ((err = ecc_set_curve_by_size(key_size, key)) != CRYPT_OK) { goto done; }
6060
} else {
61-
if ((err = ecc_set_dp(cu, key)) != CRYPT_OK) { goto done; }
61+
if ((err = ecc_set_curve(cu, key)) != CRYPT_OK) { goto done; }
6262
}
6363

6464
if (flags[0] == 1) {

‎src/pk/ecc/ecc_import_openssl.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ static int _ecc_import_private_with_oid(const unsigned char *in, unsigned long i
3636
/* load curve parameters for given curve OID */
3737
len = sizeof(OID);
3838
if ((err = pk_oid_num_to_str(curveoid, custom[0].size, OID, &len)) != CRYPT_OK) { goto error; }
39-
if ((err = ecc_get_curve(OID, &curve)) != CRYPT_OK) { goto error; }
40-
if ((err = ecc_set_dp(curve, key)) != CRYPT_OK) { goto error; }
39+
if ((err = ecc_find_curve(OID, &curve)) != CRYPT_OK) { goto error; }
40+
if ((err = ecc_set_curve(curve, key)) != CRYPT_OK) { goto error; }
4141
/* load private+public key */
4242
err = ecc_set_key(bin_k, seq_priv[1].size, PK_PRIVATE, key);
4343
}
@@ -96,7 +96,7 @@ static int _ecc_import_private_with_curve(const unsigned char *in, unsigned long
9696
if ((err = mp_read_unsigned_bin(b, bin_b, len_b)) != CRYPT_OK) { goto error; }
9797
if ((err = ltc_ecc_import_point(bin_g, len_g, prime, a, b, gx, gy)) != CRYPT_OK) { goto error; }
9898
/* load curve parameters */
99-
if ((err = ecc_set_dp_from_mpis(a, b, prime, order, gx, gy, cofactor, key)) != CRYPT_OK) { goto error; }
99+
if ((err = ecc_set_curve_from_mpis(a, b, prime, order, gx, gy, cofactor, key)) != CRYPT_OK) { goto error; }
100100
/* load private+public key */
101101
err = ecc_set_key(bin_k, len_k, PK_PRIVATE, key);
102102
}

‎src/pk/ecc/ecc_import_x509.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ static int _ecc_import_x509_with_oid(const unsigned char *in, unsigned long inle
2727
/* load curve parameters for given curve OID */
2828
len = sizeof(OID);
2929
if ((err = pk_oid_num_to_str(curveoid, len_oid, OID, &len)) != CRYPT_OK) { goto error; }
30-
if ((err = ecc_get_curve(OID, &curve)) != CRYPT_OK) { goto error; }
31-
if ((err = ecc_set_dp(curve, key)) != CRYPT_OK) { goto error; }
30+
if ((err = ecc_find_curve(OID, &curve)) != CRYPT_OK) { goto error; }
31+
if ((err = ecc_set_curve(curve, key)) != CRYPT_OK) { goto error; }
3232
/* load public key */
3333
err = ecc_set_key(bin_xy, len_xy, PK_PUBLIC, key);
3434
}
@@ -80,7 +80,7 @@ static int _ecc_import_x509_with_curve(const unsigned char *in, unsigned long in
8080
if ((err = mp_read_unsigned_bin(b, bin_b, len_b)) != CRYPT_OK) { goto error; }
8181
if ((err = ltc_ecc_import_point(bin_g, len_g, prime, a, b, gx, gy)) != CRYPT_OK) { goto error; }
8282
/* load curve parameters */
83-
if ((err = ecc_set_dp_from_mpis(a, b, prime, order, gx, gy, cofactor, key)) != CRYPT_OK) { goto error; }
83+
if ((err = ecc_set_curve_from_mpis(a, b, prime, order, gx, gy, cofactor, key)) != CRYPT_OK) { goto error; }
8484
/* load public key */
8585
err = ecc_set_key(bin_xy, len_xy, PK_PUBLIC, key);
8686
}

‎src/pk/ecc/ecc_make_key.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ int ecc_make_key(prng_state *prng, int wprng, int keysize, ecc_key *key)
2828
{
2929
int err;
3030

31-
if ((err = ecc_set_dp_by_size(keysize, key)) != CRYPT_OK) { return err; }
32-
if ((err = ecc_generate_key(prng, wprng, key)) != CRYPT_OK) { return err; }
31+
if ((err = ecc_set_curve_by_size(keysize, key)) != CRYPT_OK) { return err; }
32+
if ((err = ecc_generate_key(prng, wprng, key)) != CRYPT_OK) { return err; }
3333
return CRYPT_OK;
3434
}
3535

3636
int ecc_make_key_ex(prng_state *prng, int wprng, ecc_key *key, const ltc_ecc_curve *cu)
3737
{
3838
int err;
39-
if ((err = ecc_set_dp(cu, key)) != CRYPT_OK) { return err; }
39+
if ((err = ecc_set_curve(cu, key)) != CRYPT_OK) { return err; }
4040
if ((err = ecc_generate_key(prng, wprng, key)) != CRYPT_OK) { return err; }
4141
return CRYPT_OK;
4242
}

‎src/pk/ecc/ecc_set_dp.c renamed to ‎src/pk/ecc/ecc_set_curve.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#ifdef LTC_MECC
1313

14-
int ecc_set_dp(const ltc_ecc_curve *cu, ecc_key *key)
14+
int ecc_set_curve(const ltc_ecc_curve *cu, ecc_key *key)
1515
{
1616
int err;
1717

@@ -47,38 +47,38 @@ int ecc_set_dp(const ltc_ecc_curve *cu, ecc_key *key)
4747
return err;
4848
}
4949

50-
int ecc_set_dp_by_size(int size, ecc_key *key)
50+
int ecc_set_curve_by_size(int size, ecc_key *key)
5151
{
5252
const ltc_ecc_curve *cu = NULL;
5353
int err = CRYPT_ERROR;
5454

5555
/* for compatibility with libtomcrypt-1.17 the sizes below must match the specific curves */
5656
if (size <= 14) {
57-
err = ecc_get_curve("SECP112R1", &cu);
57+
err = ecc_find_curve("SECP112R1", &cu);
5858
}
5959
else if (size <= 16) {
60-
err = ecc_get_curve("SECP128R1", &cu);
60+
err = ecc_find_curve("SECP128R1", &cu);
6161
}
6262
else if (size <= 20) {
63-
err = ecc_get_curve("SECP160R1", &cu);
63+
err = ecc_find_curve("SECP160R1", &cu);
6464
}
6565
else if (size <= 24) {
66-
err = ecc_get_curve("SECP192R1", &cu);
66+
err = ecc_find_curve("SECP192R1", &cu);
6767
}
6868
else if (size <= 28) {
69-
err = ecc_get_curve("SECP224R1", &cu);
69+
err = ecc_find_curve("SECP224R1", &cu);
7070
}
7171
else if (size <= 32) {
72-
err = ecc_get_curve("SECP256R1", &cu);
72+
err = ecc_find_curve("SECP256R1", &cu);
7373
}
7474
else if (size <= 48) {
75-
err = ecc_get_curve("SECP384R1", &cu);
75+
err = ecc_find_curve("SECP384R1", &cu);
7676
}
7777
else if (size <= 66) {
78-
err = ecc_get_curve("SECP521R1", &cu);
78+
err = ecc_find_curve("SECP521R1", &cu);
7979
}
8080

81-
if (err == CRYPT_OK && cu != NULL) return ecc_set_dp(cu, key);
81+
if (err == CRYPT_OK && cu != NULL) return ecc_set_curve(cu, key);
8282

8383
return CRYPT_INVALID_ARG;
8484
}

‎src/pk/ecc/ecc_set_dp_internal.c renamed to ‎src/pk/ecc/ecc_set_curve_internal.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ static void _ecc_oid_lookup(ecc_key *key)
4242
}
4343
}
4444

45-
int ecc_copy_dp(const ecc_key *srckey, ecc_key *key)
45+
int ecc_copy_curve(const ecc_key *srckey, ecc_key *key)
4646
{
4747
unsigned long i;
4848
int err;
@@ -82,7 +82,7 @@ int ecc_copy_dp(const ecc_key *srckey, ecc_key *key)
8282
return err;
8383
}
8484

85-
int ecc_set_dp_from_mpis(void *a, void *b, void *prime, void *order, void *gx, void *gy, unsigned long cofactor, ecc_key *key)
85+
int ecc_set_curve_from_mpis(void *a, void *b, void *prime, void *order, void *gx, void *gy, unsigned long cofactor, ecc_key *key)
8686
{
8787
int err;
8888

‎src/pk/ecc/ecc_sign_hash.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ static int _ecc_sign_hash(const unsigned char *in, unsigned long inlen,
6363

6464
/* make up a key and export the public copy */
6565
do {
66-
if ((err = ecc_copy_dp(key, &pubkey)) != CRYPT_OK) { goto errnokey; }
66+
if ((err = ecc_copy_curve(key, &pubkey)) != CRYPT_OK) { goto errnokey; }
6767
if ((err = ecc_generate_key(prng, wprng, &pubkey)) != CRYPT_OK) { goto errnokey; }
6868

6969
/* find r = x1 mod n */

0 commit comments

Comments
 (0)