Skip to content

Commit 611ca6b

Browse files
karel-mkarel-m
committed
rename ecc_set_dp (+related) to ecc_set_curve
1 parent 091d528 commit 611ca6b

13 files changed

+30
-30
lines changed

‎src/headers/tomcrypt_pk.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ void ecc_sizes(int *low, int *high);
252252
int ecc_get_size(const ecc_key *key);
253253

254254
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);
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_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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ static int _ecc_import_private_with_oid(const unsigned char *in, unsigned long i
3737
len = sizeof(OID);
3838
if ((err = pk_oid_num_to_str(curveoid, custom[0].size, OID, &len)) != CRYPT_OK) { goto error; }
3939
if ((err = ecc_get_curve(OID, &curve)) != CRYPT_OK) { goto error; }
40-
if ((err = ecc_set_dp(curve, key)) != 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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ static int _ecc_import_x509_with_oid(const unsigned char *in, unsigned long inle
2828
len = sizeof(OID);
2929
if ((err = pk_oid_num_to_str(curveoid, len_oid, OID, &len)) != CRYPT_OK) { goto error; }
3030
if ((err = ecc_get_curve(OID, &curve)) != CRYPT_OK) { goto error; }
31-
if ((err = ecc_set_dp(curve, key)) != 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: 3 additions & 3 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,7 +47,7 @@ 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;
@@ -78,7 +78,7 @@ int ecc_set_dp_by_size(int size, ecc_key *key)
7878
err = ecc_get_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
}

0 commit comments

Comments
 (0)