Commit 0388ac4c authored by Adam Langley's avatar Adam Langley Committed by Emilia Kasper
Browse files

RT3065: ec_private_key_dont_crash 



This change saves several EC routines from crashing when an EC_KEY is
missing a public key. The public key is optional in the EC private key
format and, without this patch, running the following through `openssl
ec` causes a crash:

-----BEGIN EC PRIVATE KEY-----
MBkCAQEECAECAwQFBgcIoAoGCCqGSM49AwEH
-----END EC PRIVATE KEY-----

Reviewed-by: default avatarDr Stephen Henson <steve@openssl.org>
parent 7b3e11c5

crypto/ec/ec_ameth.c

+8 −6
Original line number Diff line number Diff line
@@ -473,15 +473,17 @@ static int do_EC_KEY_print(BIO *bp, const EC_KEY *x, int off, int ktype) 
	if (ktype > 0)

		{

		public_key = EC_KEY_get0_public_key(x);

		if (public_key != NULL)

			{

			if ((pub_key = EC_POINT_point2bn(group, public_key,

				EC_KEY_get_conv_form(x), NULL, ctx)) == NULL)

				{

				reason = ERR_R_EC_LIB;

				goto err;

				}

		if (pub_key)

			buf_len = (size_t)BN_num_bytes(pub_key);

			}

		}



	if (ktype == 2)

		{

crypto/ec/ec_asn1.c

+2 −1
Original line number Diff line number Diff line
@@ -1230,7 +1230,8 @@ int i2d_ECPrivateKey(EC_KEY *a, unsigned char **out) 
	size_t          buf_len=0, tmp_len;

	EC_PRIVATEKEY   *priv_key=NULL;



	if (a == NULL || a->group == NULL || a->priv_key == NULL)

	if (a == NULL || a->group == NULL || a->priv_key == NULL ||

	    (!(a->enc_flag & EC_PKEY_NO_PUBKEY) && a->pub_key == NULL))

		{

		ECerr(EC_F_I2D_ECPRIVATEKEY,

                      ERR_R_PASSED_NULL_PARAMETER);