evp_pkey.c 16.4 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 83
	ASN1_TYPE *t1, *t2;
	STACK_OF(ASN1_TYPE) *ndsa = NULL;
B
Bodo Möller 已提交
84
#endif
85 86
#ifndef OPENSSL_NO_EC
	EC_KEY *eckey = NULL;
B
Bodo Möller 已提交
87
#endif
88
#if !defined(OPENSSL_NO_DSA) || !defined(OPENSSL_NO_EC)
89
	ASN1_TYPE    *param = NULL;	
90 91
	ASN1_INTEGER *privkey;
	BN_CTX *ctx = NULL;
92 93 94
	int plen;
#endif
	X509_ALGOR *a;
95
	unsigned char *p;
R
Richard Levitte 已提交
96
	const unsigned char *cp;
97
	int pkeylen;
B
Bodo Möller 已提交
98
	int  nid;
99 100
	char obj_tmp[80];

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

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

		    if(t2->type != V_ASN1_INTEGER) {
			EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_DECODE_ERROR);
167
			goto dsaerr;
168 169
		    }
		    privkey = t2->value.integer;
170 171
		} else {
			if (!(privkey=d2i_ASN1_INTEGER (NULL, &p, pkeylen))) {
172
				EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_DECODE_ERROR);
173
				goto dsaerr;
174 175 176
			}
			param = p8->pkeyalg->parameter;
		}
177
		if (!param || (param->type != V_ASN1_SEQUENCE)) {
178
			EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_DECODE_ERROR);
179
			goto dsaerr;
180
		}
R
Richard Levitte 已提交
181
		cp = p = param->value.sequence->data;
182
		plen = param->value.sequence->length;
183 184 185 186 187 188 189 190 191 192 193 194 195 196 197
		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())) {
198
			EVPerr(EVP_F_EVP_PKCS82PKEY,ERR_R_MALLOC_FAILURE);
199
			goto dsaerr;
200
		}
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:
		if (!(privkey=d2i_ASN1_INTEGER (NULL, &p, pkeylen)))
B
Bodo Möller 已提交
225
		{
226 227 228 229
			EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_DECODE_ERROR);
			goto ecerr;
		}
		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 272 273 274 275 276 277 278 279 280 281
			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 */
		if (!(eckey->priv_key = ASN1_INTEGER_to_BN(privkey, NULL)))
		{
			EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_BN_DECODE_ERROR);
			goto ecerr;
		}
		/* Calculate public key */
		if ((eckey->pub_key = EC_POINT_new(eckey->group)) == NULL)
		{
			EVPerr(EVP_F_EVP_PKCS82PKEY, ERR_R_EC_LIB);
			goto ecerr;
282
		}
283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300
		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;
		}

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

322 323 324 325 326
PKCS8_PRIV_KEY_INFO *EVP_PKEY2PKCS8(EVP_PKEY *pkey)
{
	return EVP_PKEY2PKCS8_broken(pkey, PKCS8_OK);
}

327 328
/* Turn a private key into a PKCS8 structure */

329
PKCS8_PRIV_KEY_INFO *EVP_PKEY2PKCS8_broken(EVP_PKEY *pkey, int broken)
330 331
{
	PKCS8_PRIV_KEY_INFO *p8;
332

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

349 350
		if(p8->broken == PKCS8_NO_OCTET) p8->pkey->type = V_ASN1_SEQUENCE;

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

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

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

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

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

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

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

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

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

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

		case PKCS8_EMBEDDED_PARAM:

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

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

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

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

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

523 524
#ifndef OPENSSL_NO_EC
static int eckey_pkey2pkcs8(PKCS8_PRIV_KEY_INFO *p8, EVP_PKEY *pkey)
B
Bodo Möller 已提交
525
{
526 527 528 529
	EC_KEY		*eckey;
	ASN1_INTEGER	*prkey = NULL;
	unsigned char	*p, *pp;
	int 		nid;
B
Bodo Möller 已提交
530

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

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

597 598 599 600 601 602 603
	/* set the private key */
	if ((prkey = BN_to_ASN1_INTEGER(pkey->pkey.eckey->priv_key, NULL)) 
		== NULL)
	{
		EVPerr(EVP_F_EC_KEY_PKEY2PKCS8, ERR_R_ASN1_LIB);
		return 0;
	}
B
Bodo Möller 已提交
604

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

607 608 609
		case PKCS8_OK:
		if (!ASN1_pack_string((char *)prkey, i2d_ASN1_INTEGER,
					 &p8->pkey->value.octet_string)) 
B
Bodo Möller 已提交
610
		{
611
			EVPerr(EVP_F_EC_KEY_PKEY2PKCS8, ERR_R_MALLOC_FAILURE);
612
			M_ASN1_INTEGER_free(prkey);
B
Bodo Möller 已提交
613 614 615
			return 0;
		}

616
		ASN1_INTEGER_free(prkey);
B
Bodo Möller 已提交
617

618 619 620 621 622 623
		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 已提交
624 625 626 627 628 629
			return 0;

	}
	return 1;
}
#endif