evp_pkey.c 17.3 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

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

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

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

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

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

		    if(t2->type != V_ASN1_INTEGER) {
			EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_DECODE_ERROR);
170
			goto dsaerr;
171 172
		    }
		    privkey = t2->value.integer;
173 174
		} else {
			if (!(privkey=d2i_ASN1_INTEGER (NULL, &p, pkeylen))) {
175
				EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_DECODE_ERROR);
176
				goto dsaerr;
177 178 179
			}
			param = p8->pkeyalg->parameter;
		}
180
		if (!param || (param->type != V_ASN1_SEQUENCE)) {
181
			EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_DECODE_ERROR);
182
			goto dsaerr;
183
		}
R
Richard Levitte 已提交
184
		cp = p = param->value.sequence->data;
185
		plen = param->value.sequence->length;
186 187 188 189 190 191 192 193 194 195 196 197 198 199 200
		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())) {
201
			EVPerr(EVP_F_EVP_PKCS82PKEY,ERR_R_MALLOC_FAILURE);
202
			goto dsaerr;
203
		}
204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226
			
		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:
227 228
		p_tmp = p;
		/* extract the ec parameters */
229
		param = p8->pkeyalg->parameter;
B
Bodo Möller 已提交
230

231 232
		if (!param || ((param->type != V_ASN1_SEQUENCE) &&
		    (param->type != V_ASN1_OBJECT)))
B
Bodo Möller 已提交
233
		{
234 235 236 237 238 239 240 241 242 243
			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 已提交
244
			{
245 246 247
				EVPerr(EVP_F_EVP_PKCS82PKEY,
					EVP_R_DECODE_ERROR);
				goto ecerr;
B
Bodo Möller 已提交
248
			}
249 250 251 252 253 254 255 256 257 258
		}
		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 已提交
259
			{
260 261 262
				EVPerr(EVP_F_EVP_PKCS82PKEY,
					ERR_R_MALLOC_FAILURE);
				goto ecerr;
B
Bodo Möller 已提交
263
			}
264 265 266 267 268 269 270 271
			if ((eckey->group = EC_GROUP_new_by_nid(
                             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 */
272
		if (!d2i_ECPrivateKey(&eckey, &p_tmp, pkeylen))
273
		{
274
			EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_DECODE_ERROR);
275 276
			goto ecerr;
		}
277 278 279

		/* calculate public key (if necessary) */
		if (!eckey->pub_key)
280
		{
281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300
			/* 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;
			}
301 302 303 304 305
		}

		EVP_PKEY_assign_EC_KEY(pkey, eckey);
		if (ctx)
			BN_CTX_free(ctx);
306
		break;
307 308 309 310
ecerr:
		if (ctx)
			BN_CTX_free(ctx);
		if (eckey)
311
			EC_KEY_free(eckey);
312 313
		if (pkey)
			EVP_PKEY_free(pkey);
314
		return NULL;
315
#endif
316 317
		default:
		EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_UNSUPPORTED_PRIVATE_KEY_ALGORITHM);
318
		if (!a->algorithm) BUF_strlcpy (obj_tmp, "NULL", sizeof obj_tmp);
319 320 321 322 323 324 325 326
		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;
}

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

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

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

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

354 355
		if(p8->broken == PKCS8_NO_OCTET) p8->pkey->type = V_ASN1_SEQUENCE;

356 357 358 359 360 361 362 363 364
		p8->pkeyalg->algorithm = OBJ_nid2obj(NID_rsaEncryption);
		p8->pkeyalg->parameter->type = V_ASN1_NULL;
		if (!ASN1_pack_string ((char *)pkey, i2d_PrivateKey,
					 &p8->pkey->value.octet_string)) {
			EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE);
			PKCS8_PRIV_KEY_INFO_free (p8);
			return NULL;
		}
		break;
365
#endif
366
#ifndef OPENSSL_NO_DSA
367
		case EVP_PKEY_DSA:
368
		if(!dsa_pkey2pkcs8(p8, pkey)) {
369 370 371
			PKCS8_PRIV_KEY_INFO_free (p8);
			return NULL;
		}
372

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

U
Ulf Möller 已提交
394
PKCS8_PRIV_KEY_INFO *PKCS8_set_broken(PKCS8_PRIV_KEY_INFO *p8, int broken)
395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416
{
	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;
		break;
		
	}
}

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

427 428
	p8->pkeyalg->algorithm = OBJ_nid2obj(NID_dsa);
	len = i2d_DSAparams (pkey->pkey.dsa, NULL);
429
	if (!(p = OPENSSL_malloc(len))) {
430 431 432 433 434 435 436 437
		EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE);
		PKCS8_PRIV_KEY_INFO_free (p8);
		return 0;
	}
	q = p;
	i2d_DSAparams (pkey->pkey.dsa, &q);
	params = ASN1_STRING_new();
	ASN1_STRING_set(params, p, len);
438
	OPENSSL_free(p);
439 440 441 442 443 444 445
	/* 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);
		return 0;
	}

	switch(p8->broken) {
446

447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466
		case PKCS8_OK:
		case PKCS8_NO_OCTET:

		if (!ASN1_pack_string((char *)prkey, i2d_ASN1_INTEGER,
					 &p8->pkey->value.octet_string)) {
			EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE);
			M_ASN1_INTEGER_free (prkey);
			return 0;
		}

		M_ASN1_INTEGER_free (prkey);
		p8->pkeyalg->parameter->value.sequence = params;
		p8->pkeyalg->parameter->type = V_ASN1_SEQUENCE;

		break;

		case PKCS8_NS_DB:

		p8->pkeyalg->parameter->value.sequence = params;
		p8->pkeyalg->parameter->type = V_ASN1_SEQUENCE;
B
Ben Laurie 已提交
467
		ndsa = sk_ASN1_TYPE_new_null();
468 469 470 471 472 473 474
		ttmp = ASN1_TYPE_new();
		if (!(ttmp->value.integer = BN_to_ASN1_INTEGER (pkey->pkey.dsa->pub_key, NULL))) {
			EVPerr(EVP_F_EVP_PKEY2PKCS8,EVP_R_ENCODE_ERROR);
			PKCS8_PRIV_KEY_INFO_free(p8);
			return 0;
		}
		ttmp->type = V_ASN1_INTEGER;
B
Ben Laurie 已提交
475
		sk_ASN1_TYPE_push(ndsa, ttmp);
476 477 478 479

		ttmp = ASN1_TYPE_new();
		ttmp->value.integer = prkey;
		ttmp->type = V_ASN1_INTEGER;
B
Ben Laurie 已提交
480
		sk_ASN1_TYPE_push(ndsa, ttmp);
481 482 483

		p8->pkey->value.octet_string = ASN1_OCTET_STRING_new();

B
Ben Laurie 已提交
484
		if (!ASN1_seq_pack_ASN1_TYPE(ndsa, i2d_ASN1_TYPE,
485 486 487 488
					 &p8->pkey->value.octet_string->data,
					 &p8->pkey->value.octet_string->length)) {

			EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE);
B
Ben Laurie 已提交
489
			sk_ASN1_TYPE_pop_free(ndsa, ASN1_TYPE_free);
490 491 492
			M_ASN1_INTEGER_free(prkey);
			return 0;
		}
B
Ben Laurie 已提交
493
		sk_ASN1_TYPE_pop_free(ndsa, ASN1_TYPE_free);
494 495 496 497 498
		break;

		case PKCS8_EMBEDDED_PARAM:

		p8->pkeyalg->parameter->type = V_ASN1_NULL;
B
Ben Laurie 已提交
499
		ndsa = sk_ASN1_TYPE_new_null();
500 501 502
		ttmp = ASN1_TYPE_new();
		ttmp->value.sequence = params;
		ttmp->type = V_ASN1_SEQUENCE;
B
Ben Laurie 已提交
503
		sk_ASN1_TYPE_push(ndsa, ttmp);
504 505 506 507

		ttmp = ASN1_TYPE_new();
		ttmp->value.integer = prkey;
		ttmp->type = V_ASN1_INTEGER;
B
Ben Laurie 已提交
508
		sk_ASN1_TYPE_push(ndsa, ttmp);
509 510 511

		p8->pkey->value.octet_string = ASN1_OCTET_STRING_new();

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

			EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE);
B
Ben Laurie 已提交
517
			sk_ASN1_TYPE_pop_free(ndsa, ASN1_TYPE_free);
518 519 520
			M_ASN1_INTEGER_free (prkey);
			return 0;
		}
B
Ben Laurie 已提交
521
		sk_ASN1_TYPE_pop_free(ndsa, ASN1_TYPE_free);
522 523 524 525 526
		break;
	}
	return 1;
}
#endif
B
Bodo Möller 已提交
527

528 529
#ifndef OPENSSL_NO_EC
static int eckey_pkey2pkcs8(PKCS8_PRIV_KEY_INFO *p8, EVP_PKEY *pkey)
B
Bodo Möller 已提交
530
{
531 532
	EC_KEY		*eckey;
	unsigned char	*p, *pp;
533 534
	int 		nid, i, ret = 0;
	unsigned int    tmp_flags;
B
Bodo Möller 已提交
535

536
	if (pkey->pkey.eckey == NULL || pkey->pkey.eckey->group == NULL)
B
Bodo Möller 已提交
537
	{
538
		EVPerr(EVP_F_EC_KEY_PKEY2PKCS8, EVP_R_MISSING_PARAMETERS);
B
Bodo Möller 已提交
539 540
		return 0;
	}
541 542 543 544 545 546 547 548 549 550 551
	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 已提交
552
	{
553 554
		ASN1_TYPE_free(p8->pkeyalg->parameter);
		p8->pkeyalg->parameter = NULL;
B
Bodo Möller 已提交
555
	}
556 557

	if ((p8->pkeyalg->parameter = ASN1_TYPE_new()) == NULL)
B
Bodo Möller 已提交
558
	{
559
		EVPerr(EVP_F_EC_KEY_PKEY2PKCS8, ERR_R_MALLOC_FAILURE);
B
Bodo Möller 已提交
560 561
		return 0;
	}
562 563 564
	
	if (EC_GROUP_get_asn1_flag(eckey->group)
                     && (nid = EC_GROUP_get_nid(eckey->group)))
B
Bodo Möller 已提交
565
	{
566 567 568
		/* 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 已提交
569
	}
570
	else	/* explicit parameters */
B
Bodo Möller 已提交
571
	{
572
		if ((i = i2d_ECParameters(eckey, NULL)) == 0)
B
Bodo Möller 已提交
573
		{
574
			EVPerr(EVP_F_EC_KEY_PKEY2PKCS8, ERR_R_EC_LIB);
B
Bodo Möller 已提交
575 576
			return 0;
		}
577
		if ((p = (unsigned char *) OPENSSL_malloc(i)) == NULL)
B
Bodo Möller 已提交
578
		{
579
			EVPerr(EVP_F_EC_KEY_PKEY2PKCS8, ERR_R_MALLOC_FAILURE);
B
Bodo Möller 已提交
580
			return 0;
581 582 583
		}	
		pp = p;
		if (!i2d_ECParameters(eckey, &pp))
B
Bodo Möller 已提交
584
		{
585
			EVPerr(EVP_F_EC_KEY_PKEY2PKCS8, ERR_R_EC_LIB);
B
Bodo Möller 已提交
586 587 588
			OPENSSL_free(p);
			return 0;
		}
589 590 591
		p8->pkeyalg->parameter->type = V_ASN1_SEQUENCE;
		if ((p8->pkeyalg->parameter->value.sequence 
			= ASN1_STRING_new()) == NULL)
B
Bodo Möller 已提交
592
		{
593 594
			EVPerr(EVP_F_EC_KEY_PKEY2PKCS8, ERR_R_ASN1_LIB);
			OPENSSL_free(p);
B
Bodo Möller 已提交
595 596
			return 0;
		}
597
		ASN1_STRING_set(p8->pkeyalg->parameter->value.sequence, p, i);
B
Bodo Möller 已提交
598
		OPENSSL_free(p);
599
	}
B
Bodo Möller 已提交
600

601
	/* set the private key */
602 603 604 605 606 607 608 609 610 611 612 613 614 615

	/* 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)
616
	{
617 618
		pkey->pkey.eckey->enc_flag = tmp_flags;
		EVPerr(EVP_F_EC_KEY_PKEY2PKCS8, ERR_R_MALLOC_FAILURE);
619 620
		return 0;
	}
621 622 623 624 625 626 627 628 629 630
	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 已提交
631

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

634
		case PKCS8_OK:
635 636 637 638 639
		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 已提交
640
		{
641
			EVPerr(EVP_F_EC_KEY_PKEY2PKCS8, ERR_R_MALLOC_FAILURE);
B
Bodo Möller 已提交
642
		}
643 644
		else
			ret = 1;
645 646 647 648 649 650
		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 已提交
651
	}
652 653 654
	OPENSSL_cleanse(p, (size_t)i);
	OPENSSL_free(p);
	return ret;
B
Bodo Möller 已提交
655 656
}
#endif