evp_pkey.c 17.2 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
#ifndef OPENSSL_NO_DSA
66
static int dsa_pkey2pkcs8(PKCS8_PRIV_KEY_INFO *p8inf, EVP_PKEY *pkey);
67
#endif
68 69
#ifndef OPENSSL_NO_EC
static int eckey_pkey2pkcs8(PKCS8_PRIV_KEY_INFO *p8inf, EVP_PKEY *pkey);
B
Bodo Möller 已提交
70
#endif
71

72 73
/* Extract a private key from a PKCS8 structure */

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

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

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

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

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

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

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

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

330 331
/* Turn a private key into a PKCS8 structure */

332
PKCS8_PRIV_KEY_INFO *EVP_PKEY2PKCS8_broken(EVP_PKEY *pkey, int broken)
333 334
{
	PKCS8_PRIV_KEY_INFO *p8;
335

336 337 338 339
	if (!(p8 = PKCS8_PRIV_KEY_INFO_new())) {	
		EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE);
		return NULL;
	}
340
	p8->broken = broken;
341 342 343 344 345 346
	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;
	}
347
	p8->pkey->type = V_ASN1_OCTET_STRING;
348
	switch (EVP_PKEY_type(pkey->type)) {
349
#ifndef OPENSSL_NO_RSA
350 351
		case EVP_PKEY_RSA:

352 353
		if(p8->broken == PKCS8_NO_OCTET) p8->pkey->type = V_ASN1_SEQUENCE;

354 355 356 357 358 359 360 361 362
		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;
363
#endif
364
#ifndef OPENSSL_NO_DSA
365
		case EVP_PKEY_DSA:
366
		if(!dsa_pkey2pkcs8(p8, pkey)) {
367 368 369
			PKCS8_PRIV_KEY_INFO_free (p8);
			return NULL;
		}
370

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

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

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

425 426
	p8->pkeyalg->algorithm = OBJ_nid2obj(NID_dsa);
	len = i2d_DSAparams (pkey->pkey.dsa, NULL);
427
	if (!(p = OPENSSL_malloc(len))) {
428 429 430 431 432 433 434 435
		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);
436
	OPENSSL_free(p);
437 438 439 440 441 442 443
	/* 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) {
444

445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464
		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 已提交
465
		ndsa = sk_ASN1_TYPE_new_null();
466 467 468 469 470 471 472
		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 已提交
473
		sk_ASN1_TYPE_push(ndsa, ttmp);
474 475 476 477

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

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

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

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

		case PKCS8_EMBEDDED_PARAM:

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

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

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

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

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

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

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

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

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

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

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

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