*) Include some named elliptic curves, and add OIDs from X9.62,
SECG, and WAP/WTLS. Each curve can be obtained from the new
function
- EC_GROUP_new_by_nid(),
+ EC_GROUP_new_by_curve_name(),
and the list of available named curves can be obtained with
EC_get_builtin_curves().
Also add a 'curve_name' member to EC_GROUP objects, which can be
accessed via
EC_GROUP_set_curve_name()
EC_GROUP_get_curve_name()
- [Nils Larsch <nla@trustcenter.de, Bodo Moeller]
+ [Nils Larsch <larsch@trustcenter.de, Bodo Moeller]
*) Remove a few calls to bn_wexpand() in BN_sqr() (the one in there
was actually never needed) and in BN_mul(). The removal in BN_mul()
goto end;
}
- group = EC_GROUP_new_by_nid(nid);
+ group = EC_GROUP_new_by_curve_name(nid);
if (group == NULL)
{
BIO_printf(bio_err, "unable to create curve (%s)\n",
goto end;
}
- ecdh->group = EC_GROUP_new_by_nid(nid);
+ ecdh->group = EC_GROUP_new_by_curve_name(nid);
if (ecdh->group == NULL)
{
BIO_printf(bio_err, "unable to create curve (%s)\n",
else
{
BIO_printf(bio_s_out,"Using default temp ECDH parameters\n");
- ecdh->group=EC_GROUP_new_by_nid(NID_sect163r2);
+ ecdh->group=EC_GROUP_new_by_curve_name(NID_sect163r2);
if (ecdh->group == NULL)
{
BIO_printf(bio_err, "unable to create curve (sect163r2)\n");
}
else
{
- ecdsa[j]->group = EC_GROUP_new_by_nid(test_curves[j]);
+ ecdsa[j]->group = EC_GROUP_new_by_curve_name(test_curves[j]);
/* Could not obtain group information */
if (ecdsa[j]->group == NULL)
{
}
else
{
- ecdh_a[j]->group = EC_GROUP_new_by_nid(test_curves[j]);
+ ecdh_a[j]->group = EC_GROUP_new_by_curve_name(test_curves[j]);
if (ecdh_a[j]->group == NULL)
{
BIO_printf(bio_err,"ECDH failure.\n");
eckey = ret->pkey.eckey;
if (eckey->group)
EC_GROUP_free(eckey->group);
- if ((eckey->group = EC_GROUP_new_by_nid(
+ if ((eckey->group = EC_GROUP_new_by_curve_name(
OBJ_obj2nid(a->parameter->value.object))) == NULL)
goto err;
EC_GROUP_set_asn1_flag(eckey->group,
EC_GROUP *EC_GROUP_new_curve_GFp(const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *);
EC_GROUP *EC_GROUP_new_curve_GF2m(const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *);
-/* EC_GROUP_new_by_nid() creates a EC_GROUP structure specified by a NID */
-EC_GROUP *EC_GROUP_new_by_nid(int nid);
+/* EC_GROUP_new_by_curve_name() creates a EC_GROUP structure
+ * specified by a curve name (in form of a NID) */
+EC_GROUP *EC_GROUP_new_by_curve_name(int nid);
/* handling of internal curves */
typedef struct {
int nid;
#define EC_F_EC_GROUP_GET_TRINOMIAL_BASIS 194
#define EC_F_EC_GROUP_GROUP2NID 147
#define EC_F_EC_GROUP_NEW 108
-#define EC_F_EC_GROUP_NEW_BY_NID 174
+#define EC_F_EC_GROUP_NEW_BY_CURVE_NAME 174
#define EC_F_EC_GROUP_NEW_FROM_DATA 175
#define EC_F_EC_GROUP_PRECOMPUTE_MULT 142
#define EC_F_EC_GROUP_SET_CURVE_GF2M 176
if (params->type == 0)
{ /* the curve is given by an OID */
tmp = OBJ_obj2nid(params->value.named_curve);
- if ((ret = EC_GROUP_new_by_nid(tmp)) == NULL)
+ if ((ret = EC_GROUP_new_by_curve_name(tmp)) == NULL)
{
ECerr(EC_F_EC_ASN1_PKPARAMETERS2GROUP,
EC_R_EC_GROUP_NEW_BY_NAME_FAILURE);
return group;
}
-EC_GROUP *EC_GROUP_new_by_nid(int nid)
+EC_GROUP *EC_GROUP_new_by_curve_name(int nid)
{
size_t i;
EC_GROUP *ret = NULL;
if (ret == NULL)
{
- ECerr(EC_F_EC_GROUP_NEW_BY_NID, EC_R_UNKNOWN_GROUP);
+ ECerr(EC_F_EC_GROUP_NEW_BY_CURVE_NAME, EC_R_UNKNOWN_GROUP);
return NULL;
}
{ERR_FUNC(EC_F_EC_GROUP_GET_TRINOMIAL_BASIS), "EC_GROUP_get_trinomial_basis"},
{ERR_FUNC(EC_F_EC_GROUP_GROUP2NID), "EC_GROUP_GROUP2NID"},
{ERR_FUNC(EC_F_EC_GROUP_NEW), "EC_GROUP_new"},
-{ERR_FUNC(EC_F_EC_GROUP_NEW_BY_NID), "EC_GROUP_new_by_nid"},
+{ERR_FUNC(EC_F_EC_GROUP_NEW_BY_CURVE_NAME), "EC_GROUP_new_by_curve_name"},
{ERR_FUNC(EC_F_EC_GROUP_NEW_FROM_DATA), "EC_GROUP_NEW_FROM_DATA"},
{ERR_FUNC(EC_F_EC_GROUP_PRECOMPUTE_MULT), "EC_GROUP_precompute_mult"},
{ERR_FUNC(EC_F_EC_GROUP_SET_CURVE_GF2M), "EC_GROUP_set_curve_GF2m"},
{
EC_GROUP *group = NULL;
int nid = curves[n].nid;
- if ((group = EC_GROUP_new_by_nid(nid)) == NULL)
+ if ((group = EC_GROUP_new_by_curve_name(nid)) == NULL)
{
ok = 0;
- fprintf(stdout, "\nEC_GROUP_new_by_nid() failed with"
+ fprintf(stdout, "\nEC_GROUP_new_curve_name() failed with"
" curve %s\n", OBJ_nid2sn(nid));
/* try next curve */
continue;
int i,alen,blen,aout,bout,ret=0;
if ((a=EC_KEY_new()) == NULL) goto err;
- if ((a->group=EC_GROUP_new_by_nid(nid)) == NULL) goto err;
+ if ((a->group=EC_GROUP_new_by_curve_name(nid)) == NULL) goto err;
if ((b=EC_KEY_new()) == NULL) goto err;
b->group = a->group;
/* create the key */
if ((key = EC_KEY_new()) == NULL)
goto x962_int_err;
- if ((key->group = EC_GROUP_new_by_nid(nid)) == NULL)
+ if ((key->group = EC_GROUP_new_by_curve_name(nid)) == NULL)
goto x962_int_err;
if (!EC_KEY_generate_key(key))
goto x962_int_err;
/* create new ecdsa key (== EC_KEY) */
if ((eckey = EC_KEY_new()) == NULL)
goto builtin_err;
- if ((eckey->group = EC_GROUP_new_by_nid(nid)) == NULL)
+ if ((eckey->group = EC_GROUP_new_by_curve_name(nid)) == NULL)
goto builtin_err;
if (EC_GROUP_get_degree(eckey->group) < 160)
/* drop the curve */
/* create second key */
if ((wrong_eckey = EC_KEY_new()) == NULL)
goto builtin_err;
- if ((wrong_eckey->group = EC_GROUP_new_by_nid(nid)) == NULL)
+ if ((wrong_eckey->group = EC_GROUP_new_by_curve_name(nid)) == NULL)
goto builtin_err;
if (!EC_KEY_generate_key(wrong_eckey))
{
ERR_R_MALLOC_FAILURE);
goto ecerr;
}
- if ((eckey->group = EC_GROUP_new_by_nid(
+ if ((eckey->group = EC_GROUP_new_by_curve_name(
OBJ_obj2nid(a->parameter->value.object))) == NULL)
goto ecerr;
EC_GROUP_set_asn1_flag(eckey->group,
goto f_err;
}
- if (!(ecdh->group=EC_GROUP_new_by_nid(curve_nid)))
+ if (!(ecdh->group=EC_GROUP_new_by_curve_name(curve_nid)))
{
SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_EC_LIB);
goto err;
goto end;
}
- ecdh->group = EC_GROUP_new_by_nid(nid);
+ ecdh->group = EC_GROUP_new_by_curve_name(nid);
if (ecdh->group == NULL)
{
BIO_printf(bio_err, "unable to create curve (%s)\n", named_curve);
}
if (ecdh->group == NULL)
- ecdh->group=EC_GROUP_new_by_nid(NID_sect163r2);
+ ecdh->group=EC_GROUP_new_by_curve_name(NID_sect163r2);
SSL_CTX_set_tmp_ecdh(s_ctx, ecdh);
SSL_CTX_set_options(s_ctx, SSL_OP_SINGLE_ECDH_USE);
BN_GF2m_mod_exp_arr 3341 EXIST::FUNCTION:
STORE_ATTR_INFO_modify_number 3342 EXIST::FUNCTION:
X509_keyid_get0 3343 EXIST::FUNCTION:
-EC_GROUP_new_by_nid 3344 EXIST::FUNCTION:EC
+EC_GROUP_new_by_curve_name 3344 EXIST::FUNCTION:EC
ENGINE_load_gmp 3345 EXIST::FUNCTION:ENGINE,GMP,STATIC_ENGINE
pitem_new 3346 EXIST::FUNCTION:
BN_GF2m_mod_mul_arr 3347 EXIST::FUNCTION: