RT3676: Expose ECgroup i2d functions (60b350a3) · Commits · CYBER - Cyber Security / TS 103 523 MSP / ETS / ETS OpenSSL

crypto/ec/ec_asn1.c

+59 −81

Original line number	Diff line number	Diff line
		@@ -250,7 +250,7 @@ ASN1_SEQUENCE(ECPARAMETERS) = {
		ASN1_SIMPLE(ECPARAMETERS, base, ASN1_OCTET_STRING),
		ASN1_SIMPLE(ECPARAMETERS, order, ASN1_INTEGER),
		ASN1_OPT(ECPARAMETERS, cofactor, ASN1_INTEGER)
		} static_ASN1_SEQUENCE_END(ECPARAMETERS)
		} ASN1_SEQUENCE_END(ECPARAMETERS)

		DECLARE_ASN1_ALLOC_FUNCTIONS(ECPARAMETERS)
		IMPLEMENT_ASN1_ALLOC_FUNCTIONS(ECPARAMETERS)
		@@ -259,7 +259,7 @@ ASN1_CHOICE(ECPKPARAMETERS) = {
		ASN1_SIMPLE(ECPKPARAMETERS, value.named_curve, ASN1_OBJECT),
		ASN1_SIMPLE(ECPKPARAMETERS, value.parameters, ECPARAMETERS),
		ASN1_SIMPLE(ECPKPARAMETERS, value.implicitlyCA, ASN1_NULL)
		} static_ASN1_CHOICE_END(ECPKPARAMETERS)
		} ASN1_CHOICE_END(ECPKPARAMETERS)

		DECLARE_ASN1_FUNCTIONS_const(ECPKPARAMETERS)
		DECLARE_ASN1_ENCODE_FUNCTIONS_const(ECPKPARAMETERS, ECPKPARAMETERS)
		@@ -282,28 +282,6 @@ IMPLEMENT_ASN1_FUNCTIONS_const(EC_PRIVATEKEY)
		static int ec_asn1_group2fieldid(const EC_GROUP , X9_62_FIELDID );
		/* ec_asn1_group2curve() sets the values in a X9_62_CURVE object */
		static int ec_asn1_group2curve(const EC_GROUP , X9_62_CURVE );
		/*
		* ec_asn1_parameters2group() creates a EC_GROUP object from a ECPARAMETERS
		* object
		*/
		static EC_GROUP ec_asn1_parameters2group(const ECPARAMETERS );
		/*
		* ec_asn1_group2parameters() creates a ECPARAMETERS object from a EC_GROUP
		* object
		*/
		static ECPARAMETERS ec_asn1_group2parameters(const EC_GROUP ,
		ECPARAMETERS *);
		/*
		* ec_asn1_pkparameters2group() creates a EC_GROUP object from a
		* ECPKPARAMETERS object
		*/
		static EC_GROUP ec_asn1_pkparameters2group(const ECPKPARAMETERS );
		/*
		* ec_asn1_group2pkparameters() creates a ECPKPARAMETERS object from a
		* EC_GROUP object
		*/
		static ECPKPARAMETERS ec_asn1_group2pkparameters(const EC_GROUP ,
		ECPKPARAMETERS *);

		/* the function definitions */

		@@ -535,8 +513,8 @@ static int ec_asn1_group2curve(const EC_GROUP group, X9_62_CURVE curve)
		return (ok);
		}

		static ECPARAMETERS ec_asn1_group2parameters(const EC_GROUP group,
		ECPARAMETERS *param)
		ECPARAMETERS EC_GROUP_get_ecparameters(const EC_GROUP group,
		ECPARAMETERS *params)
		{
		size_t len = 0;
		ECPARAMETERS *ret = NULL;
		@@ -545,32 +523,32 @@ static ECPARAMETERS ec_asn1_group2parameters(const EC_GROUP group,
		const EC_POINT *point = NULL;
		point_conversion_form_t form;

		if (param == NULL) {
		if (params == NULL) {
		if ((ret = ECPARAMETERS_new()) == NULL) {
		ECerr(EC_F_EC_ASN1_GROUP2PARAMETERS, ERR_R_MALLOC_FAILURE);
		ECerr(EC_F_EC_GROUP_GET_ECPARAMETERS, ERR_R_MALLOC_FAILURE);
		goto err;
		}
		} else
		ret = param;
		ret = params;

		/* set the version (always one) */
		ret->version = (long)0x1;

		/* set the fieldID */
		if (!ec_asn1_group2fieldid(group, ret->fieldID)) {
		ECerr(EC_F_EC_ASN1_GROUP2PARAMETERS, ERR_R_EC_LIB);
		ECerr(EC_F_EC_GROUP_GET_ECPARAMETERS, ERR_R_EC_LIB);
		goto err;
		}

		/* set the curve */
		if (!ec_asn1_group2curve(group, ret->curve)) {
		ECerr(EC_F_EC_ASN1_GROUP2PARAMETERS, ERR_R_EC_LIB);
		ECerr(EC_F_EC_GROUP_GET_ECPARAMETERS, ERR_R_EC_LIB);
		goto err;
		}

		/* set the base point */
		if ((point = EC_GROUP_get0_generator(group)) == NULL) {
		ECerr(EC_F_EC_ASN1_GROUP2PARAMETERS, EC_R_UNDEFINED_GENERATOR);
		ECerr(EC_F_EC_GROUP_GET_ECPARAMETERS, EC_R_UNDEFINED_GENERATOR);
		goto err;
		}

		@@ -578,27 +556,27 @@ static ECPARAMETERS ec_asn1_group2parameters(const EC_GROUP group,

		len = EC_POINT_point2buf(group, point, form, &buffer, NULL);
		if (len == 0) {
		ECerr(EC_F_EC_ASN1_GROUP2PARAMETERS, ERR_R_EC_LIB);
		ECerr(EC_F_EC_GROUP_GET_ECPARAMETERS, ERR_R_EC_LIB);
		goto err;
		}
		if (ret->base == NULL && (ret->base = ASN1_OCTET_STRING_new()) == NULL) {
		ECerr(EC_F_EC_ASN1_GROUP2PARAMETERS, ERR_R_MALLOC_FAILURE);
		ECerr(EC_F_EC_GROUP_GET_ECPARAMETERS, ERR_R_MALLOC_FAILURE);
		goto err;
		}
		if (!ASN1_OCTET_STRING_set(ret->base, buffer, len)) {
		ECerr(EC_F_EC_ASN1_GROUP2PARAMETERS, ERR_R_ASN1_LIB);
		ECerr(EC_F_EC_GROUP_GET_ECPARAMETERS, ERR_R_ASN1_LIB);
		goto err;
		}

		/* set the order */
		tmp = EC_GROUP_get0_order(group);
		if (tmp == NULL) {
		ECerr(EC_F_EC_ASN1_GROUP2PARAMETERS, ERR_R_EC_LIB);
		ECerr(EC_F_EC_GROUP_GET_ECPARAMETERS, ERR_R_EC_LIB);
		goto err;
		}
		ret->order = BN_to_ASN1_INTEGER(tmp, ret->order);
		if (ret->order == NULL) {
		ECerr(EC_F_EC_ASN1_GROUP2PARAMETERS, ERR_R_ASN1_LIB);
		ECerr(EC_F_EC_GROUP_GET_ECPARAMETERS, ERR_R_ASN1_LIB);
		goto err;
		}

		@@ -607,7 +585,7 @@ static ECPARAMETERS ec_asn1_group2parameters(const EC_GROUP group,
		if (tmp != NULL) {
		ret->cofactor = BN_to_ASN1_INTEGER(tmp, ret->cofactor);
		if (ret->cofactor == NULL) {
		ECerr(EC_F_EC_ASN1_GROUP2PARAMETERS, ERR_R_ASN1_LIB);
		ECerr(EC_F_EC_GROUP_GET_ECPARAMETERS, ERR_R_ASN1_LIB);
		goto err;
		}
		}
		@@ -615,13 +593,13 @@ static ECPARAMETERS ec_asn1_group2parameters(const EC_GROUP group,
		return ret;

		err:
		if (!param)
		if (params == NULL)
		ECPARAMETERS_free(ret);
		OPENSSL_free(buffer);
		return NULL;
		}

		ECPKPARAMETERS ec_asn1_group2pkparameters(const EC_GROUP group,
		ECPKPARAMETERS EC_GROUP_get_ecpkparameters(const EC_GROUP group,
		ECPKPARAMETERS *params)
		{
		int ok = 1, tmp;
		@@ -629,7 +607,7 @@ ECPKPARAMETERS ec_asn1_group2pkparameters(const EC_GROUP group,

		if (ret == NULL) {
		if ((ret = ECPKPARAMETERS_new()) == NULL) {
		ECerr(EC_F_EC_ASN1_GROUP2PKPARAMETERS, ERR_R_MALLOC_FAILURE);
		ECerr(EC_F_EC_GROUP_GET_ECPKPARAMETERS, ERR_R_MALLOC_FAILURE);
		return NULL;
		}
		} else {
		@@ -655,7 +633,7 @@ ECPKPARAMETERS ec_asn1_group2pkparameters(const EC_GROUP group,
		/* use the ECPARAMETERS structure */
		ret->type = 1;
		if ((ret->value.parameters =
		ec_asn1_group2parameters(group, NULL)) == NULL)
		EC_GROUP_get_ecparameters(group, NULL)) == NULL)
		ok = 0;
		}

		@@ -666,7 +644,7 @@ ECPKPARAMETERS ec_asn1_group2pkparameters(const EC_GROUP group,
		return ret;
		}

		static EC_GROUP ec_asn1_parameters2group(const ECPARAMETERS params)
		EC_GROUP EC_GROUP_new_from_ecparameters(const ECPARAMETERS params)
		{
		int ok = 0, tmp;
		EC_GROUP *ret = NULL;
		@@ -676,7 +654,7 @@ static EC_GROUP ec_asn1_parameters2group(const ECPARAMETERS params)

		if (!params->fieldID \|\| !params->fieldID->fieldType \|\|
		!params->fieldID->p.ptr) {
		ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, EC_R_ASN1_ERROR);
		ECerr(EC_F_EC_GROUP_NEW_FROM_ECPARAMETERS, EC_R_ASN1_ERROR);
		goto err;
		}

		@@ -684,17 +662,17 @@ static EC_GROUP ec_asn1_parameters2group(const ECPARAMETERS params)
		if (!params->curve \|\| !params->curve->a \|\|
		!params->curve->a->data \|\| !params->curve->b \|\|
		!params->curve->b->data) {
		ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, EC_R_ASN1_ERROR);
		ECerr(EC_F_EC_GROUP_NEW_FROM_ECPARAMETERS, EC_R_ASN1_ERROR);
		goto err;
		}
		a = BN_bin2bn(params->curve->a->data, params->curve->a->length, NULL);
		if (a == NULL) {
		ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, ERR_R_BN_LIB);
		ECerr(EC_F_EC_GROUP_NEW_FROM_ECPARAMETERS, ERR_R_BN_LIB);
		goto err;
		}
		b = BN_bin2bn(params->curve->b->data, params->curve->b->length, NULL);
		if (b == NULL) {
		ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, ERR_R_BN_LIB);
		ECerr(EC_F_EC_GROUP_NEW_FROM_ECPARAMETERS, ERR_R_BN_LIB);
		goto err;
		}

		@@ -703,7 +681,7 @@ static EC_GROUP ec_asn1_parameters2group(const ECPARAMETERS params)
		if (tmp == NID_X9_62_characteristic_two_field)
		#ifdef OPENSSL_NO_EC2M
		{
		ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, EC_R_GF2M_NOT_SUPPORTED);
		ECerr(EC_F_EC_GROUP_NEW_FROM_ECPARAMETERS, EC_R_GF2M_NOT_SUPPORTED);
		goto err;
		}
		#else
		@@ -714,12 +692,12 @@ static EC_GROUP ec_asn1_parameters2group(const ECPARAMETERS params)

		field_bits = char_two->m;
		if (field_bits > OPENSSL_ECC_MAX_FIELD_BITS) {
		ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, EC_R_FIELD_TOO_LARGE);
		ECerr(EC_F_EC_GROUP_NEW_FROM_ECPARAMETERS, EC_R_FIELD_TOO_LARGE);
		goto err;
		}

		if ((p = BN_new()) == NULL) {
		ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, ERR_R_MALLOC_FAILURE);
		ECerr(EC_F_EC_GROUP_NEW_FROM_ECPARAMETERS, ERR_R_MALLOC_FAILURE);
		goto err;
		}

		@@ -730,14 +708,14 @@ static EC_GROUP ec_asn1_parameters2group(const ECPARAMETERS params)
		long tmp_long;

		if (!char_two->p.tpBasis) {
		ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, EC_R_ASN1_ERROR);
		ECerr(EC_F_EC_GROUP_NEW_FROM_ECPARAMETERS, EC_R_ASN1_ERROR);
		goto err;
		}

		tmp_long = ASN1_INTEGER_get(char_two->p.tpBasis);

		if (!(char_two->m > tmp_long && tmp_long > 0)) {
		ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP,
		ECerr(EC_F_EC_GROUP_NEW_FROM_ECPARAMETERS,
		EC_R_INVALID_TRINOMIAL_BASIS);
		goto err;
		}
		@@ -754,14 +732,14 @@ static EC_GROUP ec_asn1_parameters2group(const ECPARAMETERS params)

		penta = char_two->p.ppBasis;
		if (!penta) {
		ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, EC_R_ASN1_ERROR);
		ECerr(EC_F_EC_GROUP_NEW_FROM_ECPARAMETERS, EC_R_ASN1_ERROR);
		goto err;
		}

		if (!
		(char_two->m > penta->k3 && penta->k3 > penta->k2
		&& penta->k2 > penta->k1 && penta->k1 > 0)) {
		ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP,
		ECerr(EC_F_EC_GROUP_NEW_FROM_ECPARAMETERS,
		EC_R_INVALID_PENTANOMIAL_BASIS);
		goto err;
		}
		@@ -778,11 +756,11 @@ static EC_GROUP ec_asn1_parameters2group(const ECPARAMETERS params)
		if (!BN_set_bit(p, 0))
		goto err;
		} else if (tmp == NID_X9_62_onBasis) {
		ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, EC_R_NOT_IMPLEMENTED);
		ECerr(EC_F_EC_GROUP_NEW_FROM_ECPARAMETERS, EC_R_NOT_IMPLEMENTED);
		goto err;
		} else { /* error */

		ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, EC_R_ASN1_ERROR);
		ECerr(EC_F_EC_GROUP_NEW_FROM_ECPARAMETERS, EC_R_ASN1_ERROR);
		goto err;
		}

		@@ -794,35 +772,35 @@ static EC_GROUP ec_asn1_parameters2group(const ECPARAMETERS params)
		/* we have a curve over a prime field */
		/* extract the prime number */
		if (!params->fieldID->p.prime) {
		ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, EC_R_ASN1_ERROR);
		ECerr(EC_F_EC_GROUP_NEW_FROM_ECPARAMETERS, EC_R_ASN1_ERROR);
		goto err;
		}
		p = ASN1_INTEGER_to_BN(params->fieldID->p.prime, NULL);
		if (p == NULL) {
		ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, ERR_R_ASN1_LIB);
		ECerr(EC_F_EC_GROUP_NEW_FROM_ECPARAMETERS, ERR_R_ASN1_LIB);
		goto err;
		}

		if (BN_is_negative(p) \|\| BN_is_zero(p)) {
		ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, EC_R_INVALID_FIELD);
		ECerr(EC_F_EC_GROUP_NEW_FROM_ECPARAMETERS, EC_R_INVALID_FIELD);
		goto err;
		}

		field_bits = BN_num_bits(p);
		if (field_bits > OPENSSL_ECC_MAX_FIELD_BITS) {
		ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, EC_R_FIELD_TOO_LARGE);
		ECerr(EC_F_EC_GROUP_NEW_FROM_ECPARAMETERS, EC_R_FIELD_TOO_LARGE);
		goto err;
		}

		/* create the EC_GROUP structure */
		ret = EC_GROUP_new_curve_GFp(p, a, b, NULL);
		} else {
		ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, EC_R_INVALID_FIELD);
		ECerr(EC_F_EC_GROUP_NEW_FROM_ECPARAMETERS, EC_R_INVALID_FIELD);
		goto err;
		}

		if (ret == NULL) {
		ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, ERR_R_EC_LIB);
		ECerr(EC_F_EC_GROUP_NEW_FROM_ECPARAMETERS, ERR_R_EC_LIB);
		goto err;
		}

		@@ -830,7 +808,7 @@ static EC_GROUP ec_asn1_parameters2group(const ECPARAMETERS params)
		if (params->curve->seed != NULL) {
		OPENSSL_free(ret->seed);
		if ((ret->seed = OPENSSL_malloc(params->curve->seed->length)) == NULL) {
		ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, ERR_R_MALLOC_FAILURE);
		ECerr(EC_F_EC_GROUP_NEW_FROM_ECPARAMETERS, ERR_R_MALLOC_FAILURE);
		goto err;
		}
		memcpy(ret->seed, params->curve->seed->data,
		@@ -839,7 +817,7 @@ static EC_GROUP ec_asn1_parameters2group(const ECPARAMETERS params)
		}

		if (!params->order \|\| !params->base \|\| !params->base->data) {
		ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, EC_R_ASN1_ERROR);
		ECerr(EC_F_EC_GROUP_NEW_FROM_ECPARAMETERS, EC_R_ASN1_ERROR);
		goto err;
		}

		@@ -853,21 +831,21 @@ static EC_GROUP ec_asn1_parameters2group(const ECPARAMETERS params)
		/* extract the ec point */
		if (!EC_POINT_oct2point(ret, point, params->base->data,
		params->base->length, NULL)) {
		ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, ERR_R_EC_LIB);
		ECerr(EC_F_EC_GROUP_NEW_FROM_ECPARAMETERS, ERR_R_EC_LIB);
		goto err;
		}

		/* extract the order */
		if ((a = ASN1_INTEGER_to_BN(params->order, a)) == NULL) {
		ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, ERR_R_ASN1_LIB);
		ECerr(EC_F_EC_GROUP_NEW_FROM_ECPARAMETERS, ERR_R_ASN1_LIB);
		goto err;
		}
		if (BN_is_negative(a) \|\| BN_is_zero(a)) {
		ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, EC_R_INVALID_GROUP_ORDER);
		ECerr(EC_F_EC_GROUP_NEW_FROM_ECPARAMETERS, EC_R_INVALID_GROUP_ORDER);
		goto err;
		}
		if (BN_num_bits(a) > (int)field_bits + 1) { /* Hasse bound */
		ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, EC_R_INVALID_GROUP_ORDER);
		ECerr(EC_F_EC_GROUP_NEW_FROM_ECPARAMETERS, EC_R_INVALID_GROUP_ORDER);
		goto err;
		}

		@@ -876,12 +854,12 @@ static EC_GROUP ec_asn1_parameters2group(const ECPARAMETERS params)
		BN_free(b);
		b = NULL;
		} else if ((b = ASN1_INTEGER_to_BN(params->cofactor, b)) == NULL) {
		ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, ERR_R_ASN1_LIB);
		ECerr(EC_F_EC_GROUP_NEW_FROM_ECPARAMETERS, ERR_R_ASN1_LIB);
		goto err;
		}
		/* set the generator, order and cofactor (if present) */
		if (!EC_GROUP_set_generator(ret, point, a, b)) {
		ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, ERR_R_EC_LIB);
		ECerr(EC_F_EC_GROUP_NEW_FROM_ECPARAMETERS, ERR_R_EC_LIB);
		goto err;
		}

		@@ -900,36 +878,36 @@ static EC_GROUP ec_asn1_parameters2group(const ECPARAMETERS params)
		return (ret);
		}

		EC_GROUP ec_asn1_pkparameters2group(const ECPKPARAMETERS params)
		EC_GROUP EC_GROUP_new_from_ecpkparameters(const ECPKPARAMETERS params)
		{
		EC_GROUP *ret = NULL;
		int tmp = 0;

		if (params == NULL) {
		ECerr(EC_F_EC_ASN1_PKPARAMETERS2GROUP, EC_R_MISSING_PARAMETERS);
		ECerr(EC_F_EC_GROUP_NEW_FROM_ECPKPARAMETERS, EC_R_MISSING_PARAMETERS);
		return NULL;
		}

		if (params->type == 0) { /* the curve is given by an OID */
		tmp = OBJ_obj2nid(params->value.named_curve);
		if ((ret = EC_GROUP_new_by_curve_name(tmp)) == NULL) {
		ECerr(EC_F_EC_ASN1_PKPARAMETERS2GROUP,
		ECerr(EC_F_EC_GROUP_NEW_FROM_ECPKPARAMETERS,
		EC_R_EC_GROUP_NEW_BY_NAME_FAILURE);
		return NULL;
		}
		EC_GROUP_set_asn1_flag(ret, OPENSSL_EC_NAMED_CURVE);
		} else if (params->type == 1) { /* the parameters are given by a
		* ECPARAMETERS structure */
		ret = ec_asn1_parameters2group(params->value.parameters);
		ret = EC_GROUP_new_from_ecparameters(params->value.parameters);
		if (!ret) {
		ECerr(EC_F_EC_ASN1_PKPARAMETERS2GROUP, ERR_R_EC_LIB);
		ECerr(EC_F_EC_GROUP_NEW_FROM_ECPKPARAMETERS, ERR_R_EC_LIB);
		return NULL;
		}
		EC_GROUP_set_asn1_flag(ret, 0x0);
		} else if (params->type == 2) { /* implicitlyCA */
		return NULL;
		} else {
		ECerr(EC_F_EC_ASN1_PKPARAMETERS2GROUP, EC_R_ASN1_ERROR);
		ECerr(EC_F_EC_GROUP_NEW_FROM_ECPKPARAMETERS, EC_R_ASN1_ERROR);
		return NULL;
		}

		@@ -950,7 +928,7 @@ EC_GROUP d2i_ECPKParameters(EC_GROUP a, const unsigned char *in, long len)
		return NULL;
		}

		if ((group = ec_asn1_pkparameters2group(params)) == NULL) {
		if ((group = EC_GROUP_new_from_ecpkparameters(params)) == NULL) {
		ECerr(EC_F_D2I_ECPKPARAMETERS, EC_R_PKPARAMETERS2GROUP_FAILURE);
		ECPKPARAMETERS_free(params);
		return NULL;
		@@ -969,7 +947,7 @@ EC_GROUP d2i_ECPKParameters(EC_GROUP a, const unsigned char *in, long len)
		int i2d_ECPKParameters(const EC_GROUP a, unsigned char *out)
		{
		int ret = 0;
		ECPKPARAMETERS *tmp = ec_asn1_group2pkparameters(a, NULL);
		ECPKPARAMETERS *tmp = EC_GROUP_get_ecpkparameters(a, NULL);
		if (tmp == NULL) {
		ECerr(EC_F_I2D_ECPKPARAMETERS, EC_R_GROUP2PKPARAMETERS_FAILURE);
		return 0;
		@@ -1006,7 +984,7 @@ EC_KEY d2i_ECPrivateKey(EC_KEY a, const unsigned char *in, long len)

		if (priv_key->parameters) {
		EC_GROUP_clear_free(ret->group);
		ret->group = ec_asn1_pkparameters2group(priv_key->parameters);
		ret->group = EC_GROUP_new_from_ecpkparameters(priv_key->parameters);
		}

		if (ret->group == NULL) {
		@@ -1097,7 +1075,7 @@ int i2d_ECPrivateKey(EC_KEY a, unsigned char *out)

		if (!(a->enc_flag & EC_PKEY_NO_PARAMETERS)) {
		if ((priv_key->parameters =
		ec_asn1_group2pkparameters(a->group,
		EC_GROUP_get_ecpkparameters(a->group,
		priv_key->parameters)) == NULL) {
		ECerr(EC_F_I2D_ECPRIVATEKEY, ERR_R_EC_LIB);
		goto err;

crypto/ec/ec_err.c

+7 −4

Original line number	Diff line number	Diff line
		@@ -107,10 +107,6 @@ static ERR_STRING_DATA EC_str_functs[] = {
		{ERR_FUNC(EC_F_ECP_NIST_MOD_521), "ECP_NIST_MOD_521"},
		{ERR_FUNC(EC_F_EC_ASN1_GROUP2CURVE), "ec_asn1_group2curve"},
		{ERR_FUNC(EC_F_EC_ASN1_GROUP2FIELDID), "ec_asn1_group2fieldid"},
		{ERR_FUNC(EC_F_EC_ASN1_GROUP2PARAMETERS), "ec_asn1_group2parameters"},
		{ERR_FUNC(EC_F_EC_ASN1_GROUP2PKPARAMETERS), "ec_asn1_group2pkparameters"},
		{ERR_FUNC(EC_F_EC_ASN1_PARAMETERS2GROUP), "ec_asn1_parameters2group"},
		{ERR_FUNC(EC_F_EC_ASN1_PKPARAMETERS2GROUP), "ec_asn1_pkparameters2group"},
		{ERR_FUNC(EC_F_EC_EX_DATA_SET_DATA), "EC_EX_DATA_set_data"},
		{ERR_FUNC(EC_F_EC_GF2M_MONTGOMERY_POINT_MULTIPLY),
		"ec_GF2m_montgomery_point_multiply"},
		@@ -189,6 +185,9 @@ static ERR_STRING_DATA EC_str_functs[] = {
		{ERR_FUNC(EC_F_EC_GROUP_GET_CURVE_GF2M), "EC_GROUP_get_curve_GF2m"},
		{ERR_FUNC(EC_F_EC_GROUP_GET_CURVE_GFP), "EC_GROUP_get_curve_GFp"},
		{ERR_FUNC(EC_F_EC_GROUP_GET_DEGREE), "EC_GROUP_get_degree"},
		{ERR_FUNC(EC_F_EC_GROUP_GET_ECPARAMETERS), "EC_GROUP_get_ecparameters"},
		{ERR_FUNC(EC_F_EC_GROUP_GET_ECPKPARAMETERS),
		"EC_GROUP_get_ecpkparameters"},
		{ERR_FUNC(EC_F_EC_GROUP_GET_ORDER), "EC_GROUP_get_order"},
		{ERR_FUNC(EC_F_EC_GROUP_GET_PENTANOMIAL_BASIS),
		"EC_GROUP_get_pentanomial_basis"},
		@@ -197,6 +196,10 @@ static ERR_STRING_DATA EC_str_functs[] = {
		{ERR_FUNC(EC_F_EC_GROUP_NEW), "EC_GROUP_new"},
		{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_NEW_FROM_ECPARAMETERS),
		"EC_GROUP_new_from_ecparameters"},
		{ERR_FUNC(EC_F_EC_GROUP_NEW_FROM_ECPKPARAMETERS),
		"EC_GROUP_new_from_ecpkparameters"},
		{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"},
		{ERR_FUNC(EC_F_EC_GROUP_SET_CURVE_GFP), "EC_GROUP_set_curve_GFp"},

doc/crypto/EC_GROUP_new.pod

+15 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,13 @@

		=head1 NAME

		EC_GROUP_new, EC_GROUP_free, EC_GROUP_clear_free, EC_GROUP_new_curve_GFp, EC_GROUP_new_curve_GF2m, EC_GROUP_new_by_curve_name, EC_GROUP_set_curve_GFp, EC_GROUP_get_curve_GFp, EC_GROUP_set_curve_GF2m, EC_GROUP_get_curve_GF2m, EC_get_builtin_curves - Functions for creating and destroying B<EC_GROUP> objects.
		EC_GROUP_new, EC_GROUP_new_from_ecparameters,
		EC_GROUP_new_from_ecpkparameters,
		EC_GROUP_free, EC_GROUP_clear_free, EC_GROUP_new_curve_GFp,
		EC_GROUP_new_curve_GF2m, EC_GROUP_new_by_curve_name, EC_GROUP_set_curve_GFp,
		EC_GROUP_get_curve_GFp, EC_GROUP_set_curve_GF2m, EC_GROUP_get_curve_GF2m,
		EC_get_builtin_curves - Functions for creating and destroying B<EC_GROUP>
		objects.

		=head1 SYNOPSIS

		@@ -10,6 +16,8 @@ EC_GROUP_new, EC_GROUP_free, EC_GROUP_clear_free, EC_GROUP_new_curve_GFp, EC_GRO
		#include <openssl/bn.h>

		EC_GROUP EC_GROUP_new(const EC_METHOD meth);
		EC_GROUP EC_GROUP_new_from_ecparameters(const ECPARAMETERS params)
		EC_GROUP EC_GROUP_new_from_ecpkparameters(const ECPKPARAMETERS params)
		void EC_GROUP_free(EC_GROUP *group);
		void EC_GROUP_clear_free(EC_GROUP *group);

		@@ -22,6 +30,9 @@ EC_GROUP_new, EC_GROUP_free, EC_GROUP_clear_free, EC_GROUP_new_curve_GFp, EC_GRO
		int EC_GROUP_set_curve_GF2m(EC_GROUP group, const BIGNUM p, const BIGNUM a, const BIGNUM b, BN_CTX *ctx);
		int EC_GROUP_get_curve_GF2m(const EC_GROUP group, BIGNUM p, BIGNUM a, BIGNUM b, BN_CTX *ctx);

		ECPARAMETERS EC_GROUP_get_ecparameters(const EC_GROUP group, ECPARAMETERS *params)
		ECPKPARAMETERS EC_GROUP_get_ecpkparameters(const EC_GROUP group, ECPKPARAMETERS *params)

		size_t EC_get_builtin_curves(EC_builtin_curve *r, size_t nitems);

		=head1 DESCRIPTION
		@@ -43,6 +54,9 @@ use a trinomial or a pentanomial for this parameter.
		A new curve can be constructed by calling EC_GROUP_new, using the implementation provided by B<meth> (see
		L<EC_GFp_simple_method(3)>). It is then necessary to call either EC_GROUP_set_curve_GFp or
		EC_GROUP_set_curve_GF2m as appropriate to create a curve defined over Fp or over F2^m respectively.
		EC_GROUP_new_from_ecparameters() will create a group from the
		specified B<params> and
		EC_GROUP_new_from_ecpkparameters() will create a group from the specific PK B<params>.

		EC_GROUP_set_curve_GFp sets the curve parameters B<p>, B<a> and B<b> for a curve over Fp stored in B<group>.
		EC_group_get_curve_GFp obtains the previously set curve parameters.

include/openssl/ec.h

+43 −12

Original line number	Diff line number	Diff line
		@@ -115,19 +115,10 @@ typedef enum {
		} point_conversion_form_t;

		typedef struct ec_method_st EC_METHOD;

		typedef struct ec_group_st
		/*-
		EC_METHOD *meth;
		-- field definition
		-- curve coefficients
		-- optional generator with associated information (order, cofactor)
		-- optional extra data (precomputed table for fast computation of multiples of generator)
		-- ASN1 stuff
		*/
		EC_GROUP;

		typedef struct ec_group_st EC_GROUP;
		typedef struct ec_point_st EC_POINT;
		typedef struct ecpk_parameters_st ECPKPARAMETERS;
		typedef struct ec_parameters_st ECPARAMETERS;

		/********************************************************************/
		/* EC_METHODs for curves over GF(p) */
		@@ -410,6 +401,7 @@ EC_GROUP EC_GROUP_new_curve_GFp(const BIGNUM p, const BIGNUM *a,
		EC_GROUP EC_GROUP_new_curve_GF2m(const BIGNUM p, const BIGNUM *a,
		const BIGNUM b, BN_CTX ctx);
		# endif

		/** Creates a EC_GROUP object with a curve specified by a NID
		* \param nid NID of the OID of the curve name
		* \return newly created EC_GROUP object with specified curve or NULL
		@@ -417,6 +409,38 @@ EC_GROUP EC_GROUP_new_curve_GF2m(const BIGNUM p, const BIGNUM *a,
		*/
		EC_GROUP *EC_GROUP_new_by_curve_name(int nid);

		/** Creates a new EC_GROUP object from an ECPARAMETERS object
		* \param params pointer to the ECPARAMETERS object
		* \return newly created EC_GROUP object with specified curve or NULL
		* if an error occurred
		*/
		EC_GROUP EC_GROUP_new_from_ecparameters(const ECPARAMETERS params);

		/** Creates an ECPARAMETERS object for the the given EC_GROUP object.
		* \param group pointer to the EC_GROUP object
		* \param params pointer to an existing ECPARAMETERS object or NULL
		* \return pointer to the new ECPARAMETERS object or NULL
		* if an error occurred.
		*/
		ECPARAMETERS EC_GROUP_get_ecparameters(const EC_GROUP group,
		ECPARAMETERS *params);

		/** Creates a new EC_GROUP object from an ECPKPARAMETERS object
		* \param params pointer to an existing ECPKPARAMETERS object, or NULL
		* \return newly created EC_GROUP object with specified curve, or NULL
		* if an error occurred
		*/
		EC_GROUP EC_GROUP_new_from_ecpkparameters(const ECPKPARAMETERS params);

		/** Creates an ECPKPARAMETERS object for the the given EC_GROUP object.
		* \param group pointer to the EC_GROUP object
		* \param params pointer to an existing ECPKPARAMETERS object or NULL
		* \return pointer to the new ECPKPARAMETERS object or NULL
		* if an error occurred.
		*/
		ECPKPARAMETERS EC_GROUP_get_ecpkparameters(const EC_GROUP group,
		ECPKPARAMETERS *params);

		/********************************************************************/
		/* handling of internal curves */
		/********************************************************************/
		@@ -740,6 +764,9 @@ int EC_GROUP_have_precompute_mult(const EC_GROUP *group);
		/* ASN1 stuff */
		/********************************************************************/

		DECLARE_ASN1_ITEM(ECPKPARAMETERS)
		DECLARE_ASN1_ITEM(ECPARAMETERS)

		/*
		* EC_GROUP_get_basis_type() returns the NID of the basis type used to
		* represent the field elements
		@@ -1489,12 +1516,16 @@ void ERR_load_EC_strings(void);
		# define EC_F_EC_GROUP_GET_CURVE_GF2M 172
		# define EC_F_EC_GROUP_GET_CURVE_GFP 130
		# define EC_F_EC_GROUP_GET_DEGREE 173
		# define EC_F_EC_GROUP_GET_ECPARAMETERS 261
		# define EC_F_EC_GROUP_GET_ECPKPARAMETERS 262
		# define EC_F_EC_GROUP_GET_ORDER 141
		# define EC_F_EC_GROUP_GET_PENTANOMIAL_BASIS 193
		# define EC_F_EC_GROUP_GET_TRINOMIAL_BASIS 194
		# define EC_F_EC_GROUP_NEW 108
		# define EC_F_EC_GROUP_NEW_BY_CURVE_NAME 174
		# define EC_F_EC_GROUP_NEW_FROM_DATA 175
		# define EC_F_EC_GROUP_NEW_FROM_ECPARAMETERS 263
		# define EC_F_EC_GROUP_NEW_FROM_ECPKPARAMETERS 264
		# define EC_F_EC_GROUP_PRECOMPUTE_MULT 142
		# define EC_F_EC_GROUP_SET_CURVE_GF2M 176
		# define EC_F_EC_GROUP_SET_CURVE_GFP 109

util/libcrypto.num

+37 −29

File changed.

Preview size limit exceeded, changes collapsed.