Commit b975183c authored by Bodo Möller's avatar Bodo Möller
Browse files

ECDSA representation bugfixes 

Submitted by: Nils Larsch
parent 083100e2

crypto/asn1/x_pubkey.c

+52 −23
Original line number Diff line number Diff line
@@ -132,11 +132,28 @@ int X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey) 
#ifndef OPENSSL_NO_ECDSA

	else if (pkey->type == EVP_PKEY_ECDSA)

		{

		int nid=0;

		unsigned char *pp;

		ECDSA *ecdsa;

		

		ecdsa = pkey->pkey.ecdsa;

		ASN1_TYPE_free(a->parameter);



		if ((a->parameter = ASN1_TYPE_new()) == NULL)

			{

			X509err(X509_F_X509_PUBKEY_SET, ERR_R_ASN1_LIB);

			OPENSSL_free(p);

			goto err;

			}



		if ((ECDSA_get_parameter_flags(ecdsa) & ECDSA_FLAG_NAMED_CURVE) && (nid = EC_GROUP_get_nid(ecdsa->group)))

			{

			/* just set the OID */

			a->parameter->type = V_ASN1_OBJECT;

			a->parameter->value.object = OBJ_nid2obj(nid);

			}

		else /* explicit parameters */

			{

			if ((i = i2d_ECDSAParameters(ecdsa, NULL)) == 0)

				{

				X509err(X509_F_X509_PUBKEY_SET, ERR_R_ECDSA_LIB);
@@ -154,12 +171,6 @@ int X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey) 
				OPENSSL_free(p);

				goto err;

				}

		if ((a->parameter = ASN1_TYPE_new()) == NULL)

			{

			X509err(X509_F_X509_PUBKEY_SET, ERR_R_ASN1_LIB);

			OPENSSL_free(p);

			goto err;

			}

			a->parameter->type = V_ASN1_SEQUENCE;

			if ((a->parameter->value.sequence = ASN1_STRING_new()) == NULL)

				{
@@ -170,6 +181,7 @@ int X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey) 
			ASN1_STRING_set(a->parameter->value.sequence, p, i);

			OPENSSL_free(p);

			}

		}

#endif

	else if (1)

		{
@@ -266,6 +278,9 @@ EVP_PKEY *X509_PUBKEY_get(X509_PUBKEY *key) 
		{

		if (a->parameter && (a->parameter->type == V_ASN1_SEQUENCE))

			{

			/* type == V_ASN1_SEQUENCE => we have explicit parameters

                         * (e.g. parameters in the X9_62_EC_PARAMETERS-structure )

			 */

			if ((ret->pkey.ecdsa= ECDSA_new()) == NULL)

				{

				X509err(X509_F_X509_PUBKEY_GET, ERR_R_MALLOC_FAILURE);
@@ -279,6 +294,20 @@ EVP_PKEY *X509_PUBKEY_get(X509_PUBKEY *key) 
				goto err;

				}

			}

		else if (a->parameter && (a->parameter->type == V_ASN1_OBJECT))

			{

			/* type == V_ASN1_OBJECT => the parameters are given

			 * by an asn1 OID

			 */

			if (ret->pkey.ecdsa == NULL)

				ret->pkey.ecdsa = ECDSA_new();

			if (ret->pkey.ecdsa->group)

				EC_GROUP_free(ret->pkey.ecdsa->group);

			ret->pkey.ecdsa->parameter_flags |= ECDSA_FLAG_NAMED_CURVE;

			if ((ret->pkey.ecdsa->group = EC_GROUP_new_by_name(OBJ_obj2nid(a->parameter->value.object))) == NULL)

				goto err;

			}

			/* the case implicitlyCA is currently not implemented */

		ret->save_parameters = 1;

		}

#endif

crypto/ecdsa/ecs_asn1.c

+1 −1
Original line number Diff line number Diff line
@@ -647,7 +647,7 @@ ECDSA *ECDSAPublicKey_set_octet_string(ECDSA **a, const unsigned char **in, lon 
		ECDSAerr(ECDSA_F_D2I_ECDSAPRIVATEKEY, ERR_R_EC_LIB);

		return 0;

	}

	ECDSA_set_conversion_form(ret, (point_conversion_form_t)*in[0]);

	ECDSA_set_conversion_form(ret, (point_conversion_form_t)(*in[0] & ~0x01));

	return ret;

}