evp_pkey.c 18.6 KB
Newer Older
1 2 3 4 5
/* evp_pkey.c */
/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
 * project 1999.
 */
/* ====================================================================
B
Bodo Möller 已提交
6
 * Copyright (c) 1999-2002 The OpenSSL Project.  All rights reserved.
7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer. 
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
 *
 * 3. All advertising materials mentioning features or use of this
 *    software must display the following acknowledgment:
 *    "This product includes software developed by the OpenSSL Project
 *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
 *
 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
 *    endorse or promote products derived from this software without
 *    prior written permission. For written permission, please contact
 *    licensing@OpenSSL.org.
 *
 * 5. Products derived from this software may not be called "OpenSSL"
 *    nor may "OpenSSL" appear in their names without prior written
 *    permission of the OpenSSL Project.
 *
 * 6. Redistributions of any form whatsoever must retain the following
 *    acknowledgment:
 *    "This product includes software developed by the OpenSSL Project
 *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
 *
 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
 * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 * OF THE POSSIBILITY OF SUCH DAMAGE.
 * ====================================================================
 *
 * This product includes cryptographic software written by Eric Young
 * (eay@cryptsoft.com).  This product includes software written by Tim
 * Hudson (tjh@cryptsoft.com).
 *
 */

#include <stdio.h>
#include <stdlib.h>
#include "cryptlib.h"
62 63
#include <openssl/x509.h>
#include <openssl/rand.h>
64 65
#include <openssl/rsa.h>
#include <openssl/dsa.h>
66
#include <openssl/bn.h>
67

68
#ifndef OPENSSL_NO_DSA
69
static int dsa_pkey2pkcs8(PKCS8_PRIV_KEY_INFO *p8inf, EVP_PKEY *pkey);
70
#endif
71 72
#ifndef OPENSSL_NO_EC
static int eckey_pkey2pkcs8(PKCS8_PRIV_KEY_INFO *p8inf, EVP_PKEY *pkey);
B
Bodo Möller 已提交
73
#endif
74

75 76
/* Extract a private key from a PKCS8 structure */

U
Ulf Möller 已提交
77
EVP_PKEY *EVP_PKCS82PKEY (PKCS8_PRIV_KEY_INFO *p8)
78
{
79
	EVP_PKEY *pkey = NULL;
80
#ifndef OPENSSL_NO_RSA
81
	RSA *rsa = NULL;
82
#endif
83
#ifndef OPENSSL_NO_DSA
84
	DSA *dsa = NULL;
85
	ASN1_TYPE *t1, *t2;
86
	ASN1_INTEGER *privkey;
87
	STACK_OF(ASN1_TYPE) *ndsa = NULL;
B
Bodo Möller 已提交
88
#endif
89 90
#ifndef OPENSSL_NO_EC
	EC_KEY *eckey = NULL;
91
	const unsigned char *p_tmp;
B
Bodo Möller 已提交
92
#endif
93
#if !defined(OPENSSL_NO_DSA) || !defined(OPENSSL_NO_EC)
94
	ASN1_TYPE    *param = NULL;	
95
	BN_CTX *ctx = NULL;
96 97 98
	int plen;
#endif
	X509_ALGOR *a;
99
	const unsigned char *p;
R
Richard Levitte 已提交
100
	const unsigned char *cp;
101
	int pkeylen;
B
Bodo Möller 已提交
102
	int  nid;
103 104
	char obj_tmp[80];

105 106
	if(p8->pkey->type == V_ASN1_OCTET_STRING) {
		p8->broken = PKCS8_OK;
107 108
		p = p8->pkey->value.octet_string->data;
		pkeylen = p8->pkey->value.octet_string->length;
109 110
	} else {
		p8->broken = PKCS8_NO_OCTET;
111 112 113 114 115 116 117 118
		p = p8->pkey->value.sequence->data;
		pkeylen = p8->pkey->value.sequence->length;
	}
	if (!(pkey = EVP_PKEY_new())) {
		EVPerr(EVP_F_EVP_PKCS82PKEY,ERR_R_MALLOC_FAILURE);
		return NULL;
	}
	a = p8->pkeyalg;
B
Bodo Möller 已提交
119 120
	nid = OBJ_obj2nid(a->algorithm);
	switch(nid)
121
	{
122
#ifndef OPENSSL_NO_RSA
123
		case NID_rsaEncryption:
R
Richard Levitte 已提交
124 125
		cp = p;
		if (!(rsa = d2i_RSAPrivateKey (NULL,&cp, pkeylen))) {
126 127 128 129 130
			EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_DECODE_ERROR);
			return NULL;
		}
		EVP_PKEY_assign_RSA (pkey, rsa);
		break;
131
#endif
132
#ifndef OPENSSL_NO_DSA
133
		case NID_dsa:
134
		/* PKCS#8 DSA is weird: you just get a private key integer
135 136 137 138
	         * and parameters in the AlgorithmIdentifier the pubkey must
		 * be recalculated.
		 */
	
139 140 141
		/* Check for broken DSA PKCS#8, UGH! */
		if(*p == (V_ASN1_SEQUENCE|V_ASN1_CONSTRUCTED)) {
		    if(!(ndsa = ASN1_seq_unpack_ASN1_TYPE(p, pkeylen, 
B
Ben Laurie 已提交
142
							  d2i_ASN1_TYPE,
143 144 145 146 147 148 149 150
							  ASN1_TYPE_free))) {
			EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_DECODE_ERROR);
			goto dsaerr;
		    }
		    if(sk_ASN1_TYPE_num(ndsa) != 2 ) {
			EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_DECODE_ERROR);
			goto dsaerr;
		    }
151 152 153 154
		    /* Handle Two broken types:
		     * SEQUENCE {parameters, priv_key}
		     * SEQUENCE {pub_key, priv_key}
		     */
155

156 157 158
		    t1 = sk_ASN1_TYPE_value(ndsa, 0);
		    t2 = sk_ASN1_TYPE_value(ndsa, 1);
		    if(t1->type == V_ASN1_SEQUENCE) {
159 160
			p8->broken = PKCS8_EMBEDDED_PARAM;
			param = t1;
161
		    } else if(a->parameter->type == V_ASN1_SEQUENCE) {
162 163
			p8->broken = PKCS8_NS_DB;
			param = a->parameter;
164
		    } else {
165
			EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_DECODE_ERROR);
166
			goto dsaerr;
167 168 169 170
		    }

		    if(t2->type != V_ASN1_INTEGER) {
			EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_DECODE_ERROR);
171
			goto dsaerr;
172 173
		    }
		    privkey = t2->value.integer;
174 175
		} else {
			if (!(privkey=d2i_ASN1_INTEGER (NULL, &p, pkeylen))) {
176
				EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_DECODE_ERROR);
177
				goto dsaerr;
178 179 180
			}
			param = p8->pkeyalg->parameter;
		}
181
		if (!param || (param->type != V_ASN1_SEQUENCE)) {
182
			EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_DECODE_ERROR);
183
			goto dsaerr;
184
		}
R
Richard Levitte 已提交
185
		cp = p = param->value.sequence->data;
186
		plen = param->value.sequence->length;
187 188 189 190 191 192 193 194 195 196 197 198 199 200 201
		if (!(dsa = d2i_DSAparams (NULL, &cp, plen))) {
			EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_DECODE_ERROR);
			goto dsaerr;
		}
		/* We have parameters now set private key */
		if (!(dsa->priv_key = ASN1_INTEGER_to_BN(privkey, NULL))) {
			EVPerr(EVP_F_EVP_PKCS82PKEY,EVP_R_BN_DECODE_ERROR);
			goto dsaerr;
		}
		/* Calculate public key (ouch!) */
		if (!(dsa->pub_key = BN_new())) {
			EVPerr(EVP_F_EVP_PKCS82PKEY,ERR_R_MALLOC_FAILURE);
			goto dsaerr;
		}
		if (!(ctx = BN_CTX_new())) {
202
			EVPerr(EVP_F_EVP_PKCS82PKEY,ERR_R_MALLOC_FAILURE);
203
			goto dsaerr;
204
		}
205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227
			
		if (!BN_mod_exp(dsa->pub_key, dsa->g,
						 dsa->priv_key, dsa->p, ctx)) {
			
			EVPerr(EVP_F_EVP_PKCS82PKEY,EVP_R_BN_PUBKEY_ERROR);
			goto dsaerr;
		}

		EVP_PKEY_assign_DSA(pkey, dsa);
		BN_CTX_free (ctx);
		if(ndsa) sk_ASN1_TYPE_pop_free(ndsa, ASN1_TYPE_free);
		else ASN1_INTEGER_free(privkey);
		break;
		dsaerr:
		BN_CTX_free (ctx);
		sk_ASN1_TYPE_pop_free(ndsa, ASN1_TYPE_free);
		DSA_free(dsa);
		EVP_PKEY_free(pkey);
		return NULL;
		break;
#endif
#ifndef OPENSSL_NO_EC
		case NID_X9_62_id_ecPublicKey:
228 229
		p_tmp = p;
		/* extract the ec parameters */
230
		param = p8->pkeyalg->parameter;
B
Bodo Möller 已提交
231

232 233
		if (!param || ((param->type != V_ASN1_SEQUENCE) &&
		    (param->type != V_ASN1_OBJECT)))
B
Bodo Möller 已提交
234
		{
235 236 237 238 239 240 241 242 243 244
			EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_DECODE_ERROR);
			goto ecerr;
		}

		if (param->type == V_ASN1_SEQUENCE)
		{
			cp = p = param->value.sequence->data;
			plen = param->value.sequence->length;

			if (!(eckey = d2i_ECParameters(NULL, &cp, plen)))
B
Bodo Möller 已提交
245
			{
246 247 248
				EVPerr(EVP_F_EVP_PKCS82PKEY,
					EVP_R_DECODE_ERROR);
				goto ecerr;
B
Bodo Möller 已提交
249
			}
250 251 252 253 254 255 256 257 258 259
		}
		else
		{
			cp = p = param->value.object->data;
			plen = param->value.object->length;

			/* type == V_ASN1_OBJECT => the parameters are given
			 * by an asn1 OID
			 */
			if ((eckey = EC_KEY_new()) == NULL)
B
Bodo Möller 已提交
260
			{
261 262 263
				EVPerr(EVP_F_EVP_PKCS82PKEY,
					ERR_R_MALLOC_FAILURE);
				goto ecerr;
B
Bodo Möller 已提交
264
			}
265
			if ((eckey->group = EC_GROUP_new_by_curve_name(
266 267 268 269 270 271 272
                             OBJ_obj2nid(a->parameter->value.object))) == NULL)
				goto ecerr;
			EC_GROUP_set_asn1_flag(eckey->group, 
						OPENSSL_EC_NAMED_CURVE);
		}

		/* We have parameters now set private key */
273
		if (!d2i_ECPrivateKey(&eckey, &p_tmp, pkeylen))
274
		{
275
			EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_DECODE_ERROR);
276 277
			goto ecerr;
		}
278 279 280

		/* calculate public key (if necessary) */
		if (!eckey->pub_key)
281
		{
282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301
			/* the public key was not included in the SEC1 private
			 * key => calculate the public key */
			eckey->pub_key = EC_POINT_new(eckey->group);
			if (!eckey->pub_key)
			{
				EVPerr(EVP_F_EVP_PKCS82PKEY, ERR_R_EC_LIB);
				goto ecerr;
			}
			if (!EC_POINT_copy(eckey->pub_key, 
				EC_GROUP_get0_generator(eckey->group)))
			{
				EVPerr(EVP_F_EVP_PKCS82PKEY, ERR_R_EC_LIB);
				goto ecerr;
			}
			if (!EC_POINT_mul(eckey->group, eckey->pub_key, 
				eckey->priv_key, NULL, NULL, ctx))
			{
				EVPerr(EVP_F_EVP_PKCS82PKEY, ERR_R_EC_LIB);
				goto ecerr;
			}
302 303 304 305 306
		}

		EVP_PKEY_assign_EC_KEY(pkey, eckey);
		if (ctx)
			BN_CTX_free(ctx);
307
		break;
308 309 310 311
ecerr:
		if (ctx)
			BN_CTX_free(ctx);
		if (eckey)
312
			EC_KEY_free(eckey);
313 314
		if (pkey)
			EVP_PKEY_free(pkey);
315
		return NULL;
316
#endif
317 318
		default:
		EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_UNSUPPORTED_PRIVATE_KEY_ALGORITHM);
319
		if (!a->algorithm) BUF_strlcpy (obj_tmp, "NULL", sizeof obj_tmp);
320 321 322 323 324 325 326 327
		else i2t_ASN1_OBJECT(obj_tmp, 80, a->algorithm);
		ERR_add_error_data(2, "TYPE=", obj_tmp);
		EVP_PKEY_free (pkey);
		return NULL;
	}
	return pkey;
}

328 329 330 331 332
PKCS8_PRIV_KEY_INFO *EVP_PKEY2PKCS8(EVP_PKEY *pkey)
{
	return EVP_PKEY2PKCS8_broken(pkey, PKCS8_OK);
}

333 334
/* Turn a private key into a PKCS8 structure */

335
PKCS8_PRIV_KEY_INFO *EVP_PKEY2PKCS8_broken(EVP_PKEY *pkey, int broken)
336 337
{
	PKCS8_PRIV_KEY_INFO *p8;
338

339 340 341 342
	if (!(p8 = PKCS8_PRIV_KEY_INFO_new())) {	
		EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE);
		return NULL;
	}
343
	p8->broken = broken;
344 345 346 347 348
	if (!ASN1_INTEGER_set(p8->version, 0)) {
		EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE);
		PKCS8_PRIV_KEY_INFO_free (p8);
		return NULL;
	}
349 350 351 352 353
	if (!(p8->pkeyalg->parameter = ASN1_TYPE_new ())) {
		EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE);
		PKCS8_PRIV_KEY_INFO_free (p8);
		return NULL;
	}
354
	p8->pkey->type = V_ASN1_OCTET_STRING;
355
	switch (EVP_PKEY_type(pkey->type)) {
356
#ifndef OPENSSL_NO_RSA
357 358
		case EVP_PKEY_RSA:

359 360
		if(p8->broken == PKCS8_NO_OCTET) p8->pkey->type = V_ASN1_SEQUENCE;

361 362
		p8->pkeyalg->algorithm = OBJ_nid2obj(NID_rsaEncryption);
		p8->pkeyalg->parameter->type = V_ASN1_NULL;
363
		if (!ASN1_pack_string_of (EVP_PKEY,pkey, i2d_PrivateKey,
364 365 366 367 368 369
					 &p8->pkey->value.octet_string)) {
			EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE);
			PKCS8_PRIV_KEY_INFO_free (p8);
			return NULL;
		}
		break;
370
#endif
371
#ifndef OPENSSL_NO_DSA
372
		case EVP_PKEY_DSA:
373
		if(!dsa_pkey2pkcs8(p8, pkey)) {
374 375 376
			PKCS8_PRIV_KEY_INFO_free (p8);
			return NULL;
		}
377

378
		break;
379
#endif
380 381
#ifndef OPENSSL_NO_EC
		case EVP_PKEY_EC:
382
		if (!eckey_pkey2pkcs8(p8, pkey))
B
Bodo Möller 已提交
383 384 385 386 387 388
		{
			PKCS8_PRIV_KEY_INFO_free(p8);
			return(NULL);
		}
		break;
#endif
389 390 391 392 393
		default:
		EVPerr(EVP_F_EVP_PKEY2PKCS8, EVP_R_UNSUPPORTED_PRIVATE_KEY_ALGORITHM);
		PKCS8_PRIV_KEY_INFO_free (p8);
		return NULL;
	}
394
	RAND_add(p8->pkey->value.octet_string->data,
395
		 p8->pkey->value.octet_string->length, 0.0);
396 397 398
	return p8;
}

U
Ulf Möller 已提交
399
PKCS8_PRIV_KEY_INFO *PKCS8_set_broken(PKCS8_PRIV_KEY_INFO *p8, int broken)
400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419
{
	switch (broken) {

		case PKCS8_OK:
		p8->broken = PKCS8_OK;
		return p8;
		break;

		case PKCS8_NO_OCTET:
		p8->broken = PKCS8_NO_OCTET;
		p8->pkey->type = V_ASN1_SEQUENCE;
		return p8;
		break;

		default:
		EVPerr(EVP_F_EVP_PKCS8_SET_BROKEN,EVP_R_PKCS8_UNKNOWN_BROKEN_TYPE);
		return NULL;
	}
}

420
#ifndef OPENSSL_NO_DSA
421 422
static int dsa_pkey2pkcs8(PKCS8_PRIV_KEY_INFO *p8, EVP_PKEY *pkey)
{
423 424 425 426 427
	ASN1_STRING *params = NULL;
	ASN1_INTEGER *prkey = NULL;
	ASN1_TYPE *ttmp = NULL;
	STACK_OF(ASN1_TYPE) *ndsa = NULL;
	unsigned char *p = NULL, *q;
428
	int len;
B
Ben Laurie 已提交
429

430 431
	p8->pkeyalg->algorithm = OBJ_nid2obj(NID_dsa);
	len = i2d_DSAparams (pkey->pkey.dsa, NULL);
432
	if (!(p = OPENSSL_malloc(len))) {
433
		EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE);
434
		goto err;
435 436 437
	}
	q = p;
	i2d_DSAparams (pkey->pkey.dsa, &q);
438 439 440 441 442 443 444 445
	if (!(params = ASN1_STRING_new())) {
		EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE);
		goto err;
	}
	if (!ASN1_STRING_set(params, p, len)) {
		EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE);
		goto err;
	}
446
	OPENSSL_free(p);
447
	p = NULL;
448 449 450
	/* Get private key into integer */
	if (!(prkey = BN_to_ASN1_INTEGER (pkey->pkey.dsa->priv_key, NULL))) {
		EVPerr(EVP_F_EVP_PKEY2PKCS8,EVP_R_ENCODE_ERROR);
451
		goto err;
452 453 454
	}

	switch(p8->broken) {
455

456 457 458
		case PKCS8_OK:
		case PKCS8_NO_OCTET:

459
		if (!ASN1_pack_string_of(ASN1_INTEGER,prkey, i2d_ASN1_INTEGER,
460 461
					 &p8->pkey->value.octet_string)) {
			EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE);
462
			goto err;
463 464 465
		}

		M_ASN1_INTEGER_free (prkey);
466
		prkey = NULL;
467
		p8->pkeyalg->parameter->value.sequence = params;
468
		params = NULL;
469 470 471 472 473 474 475
		p8->pkeyalg->parameter->type = V_ASN1_SEQUENCE;

		break;

		case PKCS8_NS_DB:

		p8->pkeyalg->parameter->value.sequence = params;
476
		params = NULL;
477
		p8->pkeyalg->parameter->type = V_ASN1_SEQUENCE;
478 479 480 481 482 483 484 485 486 487
		if (!(ndsa = sk_ASN1_TYPE_new_null())) {
			EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE);
			goto err;
		}
		if (!(ttmp = ASN1_TYPE_new())) {
			EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE);
			goto err;
		}
		if (!(ttmp->value.integer =
			BN_to_ASN1_INTEGER(pkey->pkey.dsa->pub_key, NULL))) {
488
			EVPerr(EVP_F_EVP_PKEY2PKCS8,EVP_R_ENCODE_ERROR);
489
			goto err;
490 491
		}
		ttmp->type = V_ASN1_INTEGER;
492 493 494 495
		if (!sk_ASN1_TYPE_push(ndsa, ttmp)) {
			EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE);
			goto err;
		}
496

497 498 499 500
		if (!(ttmp = ASN1_TYPE_new())) {
			EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE);
			goto err;
		}
501
		ttmp->value.integer = prkey;
502
		prkey = NULL;
503
		ttmp->type = V_ASN1_INTEGER;
504 505 506 507 508
		if (!sk_ASN1_TYPE_push(ndsa, ttmp)) {
			EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE);
			goto err;
		}
		ttmp = NULL;
509

510 511 512 513
		if (!(p8->pkey->value.octet_string = ASN1_OCTET_STRING_new())) {
			EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE);
			goto err;
		}
514

B
Ben Laurie 已提交
515
		if (!ASN1_seq_pack_ASN1_TYPE(ndsa, i2d_ASN1_TYPE,
516 517 518 519
					 &p8->pkey->value.octet_string->data,
					 &p8->pkey->value.octet_string->length)) {

			EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE);
520
			goto err;
521
		}
B
Ben Laurie 已提交
522
		sk_ASN1_TYPE_pop_free(ndsa, ASN1_TYPE_free);
523 524 525 526 527
		break;

		case PKCS8_EMBEDDED_PARAM:

		p8->pkeyalg->parameter->type = V_ASN1_NULL;
528 529 530 531 532 533 534 535
		if (!(ndsa = sk_ASN1_TYPE_new_null())) {
			EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE);
			goto err;
		}
		if (!(ttmp = ASN1_TYPE_new())) {
			EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE);
			goto err;
		}
536
		ttmp->value.sequence = params;
537
		params = NULL;
538
		ttmp->type = V_ASN1_SEQUENCE;
539 540 541 542
		if (!sk_ASN1_TYPE_push(ndsa, ttmp)) {
			EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE);
			goto err;
		}
543

544 545 546 547
		if (!(ttmp = ASN1_TYPE_new())) {
			EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE);
			goto err;
		}
548
		ttmp->value.integer = prkey;
549
		prkey = NULL;
550
		ttmp->type = V_ASN1_INTEGER;
551 552 553 554 555
		if (!sk_ASN1_TYPE_push(ndsa, ttmp)) {
			EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE);
			goto err;
		}
		ttmp = NULL;
556

557 558 559 560
		if (!(p8->pkey->value.octet_string = ASN1_OCTET_STRING_new())) {
			EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE);
			goto err;
		}
561

B
Ben Laurie 已提交
562
		if (!ASN1_seq_pack_ASN1_TYPE(ndsa, i2d_ASN1_TYPE,
563 564 565 566
					 &p8->pkey->value.octet_string->data,
					 &p8->pkey->value.octet_string->length)) {

			EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE);
567
			goto err;
568
		}
B
Ben Laurie 已提交
569
		sk_ASN1_TYPE_pop_free(ndsa, ASN1_TYPE_free);
570 571 572
		break;
	}
	return 1;
573 574 575 576 577 578 579
err:
	if (p != NULL) OPENSSL_free(p);
	if (params != NULL) ASN1_STRING_free(params);
	if (prkey != NULL) M_ASN1_INTEGER_free(prkey);
	if (ttmp != NULL) ASN1_TYPE_free(ttmp);
	if (ndsa != NULL) sk_ASN1_TYPE_pop_free(ndsa, ASN1_TYPE_free);
	return 0;
580 581
}
#endif
B
Bodo Möller 已提交
582

583 584
#ifndef OPENSSL_NO_EC
static int eckey_pkey2pkcs8(PKCS8_PRIV_KEY_INFO *p8, EVP_PKEY *pkey)
B
Bodo Möller 已提交
585
{
586 587
	EC_KEY		*eckey;
	unsigned char	*p, *pp;
588 589
	int 		nid, i, ret = 0;
	unsigned int    tmp_flags;
B
Bodo Möller 已提交
590

591
	if (pkey->pkey.eckey == NULL || pkey->pkey.eckey->group == NULL)
B
Bodo Möller 已提交
592
	{
593
		EVPerr(EVP_F_EC_KEY_PKEY2PKCS8, EVP_R_MISSING_PARAMETERS);
B
Bodo Möller 已提交
594 595
		return 0;
	}
596 597 598 599 600 601 602 603 604 605 606
	eckey = pkey->pkey.eckey;

	/* set the ec parameters OID */
	if (p8->pkeyalg->algorithm)
		ASN1_OBJECT_free(p8->pkeyalg->algorithm);

	p8->pkeyalg->algorithm = OBJ_nid2obj(NID_X9_62_id_ecPublicKey);

	/* set the ec parameters */

	if (p8->pkeyalg->parameter)
B
Bodo Möller 已提交
607
	{
608 609
		ASN1_TYPE_free(p8->pkeyalg->parameter);
		p8->pkeyalg->parameter = NULL;
B
Bodo Möller 已提交
610
	}
611 612

	if ((p8->pkeyalg->parameter = ASN1_TYPE_new()) == NULL)
B
Bodo Möller 已提交
613
	{
614
		EVPerr(EVP_F_EC_KEY_PKEY2PKCS8, ERR_R_MALLOC_FAILURE);
B
Bodo Möller 已提交
615 616
		return 0;
	}
617 618
	
	if (EC_GROUP_get_asn1_flag(eckey->group)
619
                     && (nid = EC_GROUP_get_curve_name(eckey->group)))
B
Bodo Möller 已提交
620
	{
621 622 623
		/* we have a 'named curve' => just set the OID */
		p8->pkeyalg->parameter->type = V_ASN1_OBJECT;
		p8->pkeyalg->parameter->value.object = OBJ_nid2obj(nid);
B
Bodo Möller 已提交
624
	}
625
	else	/* explicit parameters */
B
Bodo Möller 已提交
626
	{
627
		if ((i = i2d_ECParameters(eckey, NULL)) == 0)
B
Bodo Möller 已提交
628
		{
629
			EVPerr(EVP_F_EC_KEY_PKEY2PKCS8, ERR_R_EC_LIB);
B
Bodo Möller 已提交
630 631
			return 0;
		}
632
		if ((p = (unsigned char *) OPENSSL_malloc(i)) == NULL)
B
Bodo Möller 已提交
633
		{
634
			EVPerr(EVP_F_EC_KEY_PKEY2PKCS8, ERR_R_MALLOC_FAILURE);
B
Bodo Möller 已提交
635
			return 0;
636 637 638
		}	
		pp = p;
		if (!i2d_ECParameters(eckey, &pp))
B
Bodo Möller 已提交
639
		{
640
			EVPerr(EVP_F_EC_KEY_PKEY2PKCS8, ERR_R_EC_LIB);
B
Bodo Möller 已提交
641 642 643
			OPENSSL_free(p);
			return 0;
		}
644 645 646
		p8->pkeyalg->parameter->type = V_ASN1_SEQUENCE;
		if ((p8->pkeyalg->parameter->value.sequence 
			= ASN1_STRING_new()) == NULL)
B
Bodo Möller 已提交
647
		{
648 649
			EVPerr(EVP_F_EC_KEY_PKEY2PKCS8, ERR_R_ASN1_LIB);
			OPENSSL_free(p);
B
Bodo Möller 已提交
650 651
			return 0;
		}
652
		ASN1_STRING_set(p8->pkeyalg->parameter->value.sequence, p, i);
B
Bodo Möller 已提交
653
		OPENSSL_free(p);
654
	}
B
Bodo Möller 已提交
655

656
	/* set the private key */
657 658 659 660 661 662 663 664 665 666 667 668 669 670

	/* do not include the parameters in the SEC1 private key
	 * see PKCS#11 12.11 */
	tmp_flags  = pkey->pkey.eckey->enc_flag;
	pkey->pkey.eckey->enc_flag |= EC_PKEY_NO_PARAMETERS;
	i = i2d_ECPrivateKey(pkey->pkey.eckey, NULL);
	if (!i)
	{
		pkey->pkey.eckey->enc_flag = tmp_flags;
		EVPerr(EVP_F_EC_KEY_PKEY2PKCS8, ERR_R_EC_LIB);
		return 0;
	}
	p = (unsigned char *) OPENSSL_malloc(i);
	if (!p)
671
	{
672 673
		pkey->pkey.eckey->enc_flag = tmp_flags;
		EVPerr(EVP_F_EC_KEY_PKEY2PKCS8, ERR_R_MALLOC_FAILURE);
674 675
		return 0;
	}
676 677 678 679 680 681 682 683 684 685
	pp = p;
	if (!i2d_ECPrivateKey(pkey->pkey.eckey, &pp))
	{
		pkey->pkey.eckey->enc_flag = tmp_flags;
		EVPerr(EVP_F_EC_KEY_PKEY2PKCS8, ERR_R_EC_LIB);
		OPENSSL_free(p);
		return 0;
	}
	/* restore old encoding flags */
	pkey->pkey.eckey->enc_flag = tmp_flags;
B
Bodo Möller 已提交
686

687
	switch(p8->broken) {
B
Bodo Möller 已提交
688

689
		case PKCS8_OK:
690 691 692 693 694
		p8->pkey->value.octet_string = ASN1_OCTET_STRING_new();
		if (!p8->pkey->value.octet_string ||
		    !M_ASN1_OCTET_STRING_set(p8->pkey->value.octet_string,
		    (const void *)p, i))

B
Bodo Möller 已提交
695
		{
696
			EVPerr(EVP_F_EC_KEY_PKEY2PKCS8, ERR_R_MALLOC_FAILURE);
B
Bodo Möller 已提交
697
		}
698 699
		else
			ret = 1;
700 701 702 703 704 705
		break;
		case PKCS8_NO_OCTET:		/* RSA specific */
		case PKCS8_NS_DB:		/* DSA specific */
		case PKCS8_EMBEDDED_PARAM:	/* DSA specific */
		default:
			EVPerr(EVP_F_EVP_PKEY2PKCS8,EVP_R_ENCODE_ERROR);
B
Bodo Möller 已提交
706
	}
707 708 709
	OPENSSL_cleanse(p, (size_t)i);
	OPENSSL_free(p);
	return ret;
B
Bodo Möller 已提交
710 711
}
#endif