Commit 7dc17a6c authored by Nils Larsch's avatar Nils Larsch
Browse files

give EC_GROUP_*_nid functions a more meaningful name 

	EC_GROUP_get_nid -> EC_GROUP_get_curve_name
	EC_GROUP_set_nid -> EC_GROUP_set_curve_name
parent b6223d2f

crypto/asn1/t_pkey.c

+1 −1
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off) 
		if (!BIO_indent(bp, off, 128))

			goto err;



		nid = EC_GROUP_get_nid(x);

		nid = EC_GROUP_get_curve_name(x);

		if (nid == 0)

			goto err;

crypto/asn1/x_pubkey.c

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ int X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey) 
			}



		if (EC_GROUP_get_asn1_flag(eckey->group)

                     && (nid = EC_GROUP_get_nid(eckey->group)))

                     && (nid = EC_GROUP_get_curve_name(eckey->group)))

			{

			/* just set the OID */

			a->parameter->type = V_ASN1_OBJECT;

crypto/ec/ec.h

+2 −2
Original line number Diff line number Diff line
@@ -143,8 +143,8 @@ EC_POINT *EC_GROUP_get0_generator(const EC_GROUP *); 
int EC_GROUP_get_order(const EC_GROUP *, BIGNUM *order, BN_CTX *);

int EC_GROUP_get_cofactor(const EC_GROUP *, BIGNUM *cofactor, BN_CTX *);



void EC_GROUP_set_nid(EC_GROUP *, int); /* curve name */

int EC_GROUP_get_nid(const EC_GROUP *);

void EC_GROUP_set_curve_name(EC_GROUP *, int nid); /* curve name */

int EC_GROUP_get_curve_name(const EC_GROUP *);



void EC_GROUP_set_asn1_flag(EC_GROUP *, int flag);

int EC_GROUP_get_asn1_flag(const EC_GROUP *);

crypto/ec/ec_asn1.c

+1 −1
Original line number Diff line number Diff line
@@ -707,7 +707,7 @@ ECPKPARAMETERS *ec_asn1_group2pkparameters(const EC_GROUP *group, 
		/* use the asn1 OID to describe the

		 * the elliptic curve parameters

		 */

		tmp = EC_GROUP_get_nid(group);

		tmp = EC_GROUP_get_curve_name(group);

		if (tmp)

			{

			ret->type = 0;

crypto/ec/ec_curve.c

+1 −1
Original line number Diff line number Diff line
@@ -1245,7 +1245,7 @@ EC_GROUP *EC_GROUP_new_by_nid(int nid) 
		return NULL;

		}



	EC_GROUP_set_nid(ret, nid);

	EC_GROUP_set_curve_name(ret, nid);



	return ret;

	}