pk7_lib.c 14.1 KB
Newer Older
1
/* crypto/pkcs7/pk7_lib.c */
2
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 4 5 6 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
 * All rights reserved.
 *
 * This package is an SSL implementation written
 * by Eric Young (eay@cryptsoft.com).
 * The implementation was written so as to conform with Netscapes SSL.
 * 
 * This library is free for commercial and non-commercial use as long as
 * the following conditions are aheared to.  The following conditions
 * apply to all code found in this distribution, be it the RC4, RSA,
 * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
 * included with this distribution is covered by the same copyright terms
 * except that the holder is Tim Hudson (tjh@cryptsoft.com).
 * 
 * Copyright remains Eric Young's, and as such any Copyright notices in
 * the code are not to be removed.
 * If this package is used in a product, Eric Young should be given attribution
 * as the author of the parts of the library used.
 * This can be in the form of a textual message at program startup or
 * in documentation (online or textual) provided with the package.
 * 
 * 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 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 acknowledgement:
 *    "This product includes cryptographic software written by
 *     Eric Young (eay@cryptsoft.com)"
 *    The word 'cryptographic' can be left out if the rouines from the library
 *    being used are not cryptographic related :-).
 * 4. If you include any Windows specific code (or a derivative thereof) from 
 *    the apps directory (application code) you must include an acknowledgement:
 *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
 * 
 * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
 * ANY EXPRESS 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 AUTHOR OR 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.
 * 
 * The licence and distribution terms for any publically available version or
 * derivative of this code cannot be changed.  i.e. this code cannot simply be
 * copied and put under another distribution licence
 * [including the GNU Public Licence.]
 */

#include <stdio.h>
#include "cryptlib.h"
61 62
#include <openssl/objects.h>
#include <openssl/x509.h>
63

U
Ulf Möller 已提交
64
long PKCS7_ctrl(PKCS7 *p7, int cmd, long larg, char *parg)
65 66 67 68 69 70 71 72 73 74 75 76
	{
	int nid;
	long ret;

	nid=OBJ_obj2nid(p7->type);

	switch (cmd)
		{
	case PKCS7_OP_SET_DETACHED_SIGNATURE:
		if (nid == NID_pkcs7_signed)
			{
			ret=p7->detached=(int)larg;
D
 
Dr. Stephen Henson 已提交
77
			if (ret && PKCS7_type_is_data(p7->d.sign->contents))
D
 
Dr. Stephen Henson 已提交
78 79 80 81 82 83
					{
					ASN1_OCTET_STRING *os;
					os=p7->d.sign->contents->d.data;
					ASN1_OCTET_STRING_free(os);
					p7->d.sign->contents->d.data = NULL;
					}
84 85 86 87 88 89 90 91 92 93
			}
		else
			{
			PKCS7err(PKCS7_F_PKCS7_CTRL,PKCS7_R_OPERATION_NOT_SUPPORTED_ON_THIS_TYPE);
			ret=0;
			}
		break;
	case PKCS7_OP_GET_DETACHED_SIGNATURE:
		if (nid == NID_pkcs7_signed)
			{
D
 
Dr. Stephen Henson 已提交
94 95 96 97 98
			if(!p7->d.sign  || !p7->d.sign->contents->d.ptr)
				ret = 1;
			else ret = 0;
				
			p7->detached = ret;
99 100 101 102 103 104 105 106 107
			}
		else
			{
			PKCS7err(PKCS7_F_PKCS7_CTRL,PKCS7_R_OPERATION_NOT_SUPPORTED_ON_THIS_TYPE);
			ret=0;
			}
			
		break;
	default:
108 109
		PKCS7err(PKCS7_F_PKCS7_CTRL,PKCS7_R_UNKNOWN_OPERATION);
		ret=0;
110 111 112 113
		}
	return(ret);
	}

U
Ulf Möller 已提交
114
int PKCS7_content_new(PKCS7 *p7, int type)
115 116 117 118 119 120 121 122 123 124 125 126 127
	{
	PKCS7 *ret=NULL;

	if ((ret=PKCS7_new()) == NULL) goto err;
	if (!PKCS7_set_type(ret,type)) goto err;
	if (!PKCS7_set_content(p7,ret)) goto err;

	return(1);
err:
	if (ret != NULL) PKCS7_free(ret);
	return(0);
	}

U
Ulf Möller 已提交
128
int PKCS7_set_content(PKCS7 *p7, PKCS7 *p7_data)
129 130 131 132 133 134 135 136
	{
	int i;

	i=OBJ_obj2nid(p7->type);
	switch (i)
		{
	case NID_pkcs7_signed:
		if (p7->d.sign->contents != NULL)
137
			PKCS7_free(p7->d.sign->contents);
138 139 140
		p7->d.sign->contents=p7_data;
		break;
	case NID_pkcs7_digest:
141 142 143 144
		if (p7->d.digest->contents != NULL)
			PKCS7_free(p7->d.digest->contents);
		p7->d.digest->contents=p7_data;
		break;
145 146 147 148 149 150 151 152 153 154 155 156 157
	case NID_pkcs7_data:
	case NID_pkcs7_enveloped:
	case NID_pkcs7_signedAndEnveloped:
	case NID_pkcs7_encrypted:
	default:
		PKCS7err(PKCS7_F_PKCS7_SET_CONTENT,PKCS7_R_UNSUPPORTED_CONTENT_TYPE);
		goto err;
		}
	return(1);
err:
	return(0);
	}

U
Ulf Möller 已提交
158
int PKCS7_set_type(PKCS7 *p7, int type)
159 160 161
	{
	ASN1_OBJECT *obj;

D
 
Dr. Stephen Henson 已提交
162
	/*PKCS7_content_free(p7);*/
163 164 165 166 167 168 169 170 171 172 173 174
	obj=OBJ_nid2obj(type); /* will not fail */

	switch (type)
		{
	case NID_pkcs7_signed:
		p7->type=obj;
		if ((p7->d.sign=PKCS7_SIGNED_new()) == NULL)
			goto err;
		ASN1_INTEGER_set(p7->d.sign->version,1);
		break;
	case NID_pkcs7_data:
		p7->type=obj;
175
		if ((p7->d.data=M_ASN1_OCTET_STRING_new()) == NULL)
176 177
			goto err;
		break;
178 179 180
	case NID_pkcs7_signedAndEnveloped:
		p7->type=obj;
		if ((p7->d.signed_and_enveloped=PKCS7_SIGN_ENVELOPE_new())
181 182
			== NULL) goto err;
		ASN1_INTEGER_set(p7->d.signed_and_enveloped->version,1);
183 184
		p7->d.signed_and_enveloped->enc_data->content_type
						= OBJ_nid2obj(NID_pkcs7_data);
185
		break;
186
	case NID_pkcs7_enveloped:
187 188 189 190
		p7->type=obj;
		if ((p7->d.enveloped=PKCS7_ENVELOPE_new())
			== NULL) goto err;
		ASN1_INTEGER_set(p7->d.enveloped->version,0);
191 192
		p7->d.enveloped->enc_data->content_type
						= OBJ_nid2obj(NID_pkcs7_data);
193
		break;
194
	case NID_pkcs7_encrypted:
195 196 197 198
		p7->type=obj;
		if ((p7->d.encrypted=PKCS7_ENCRYPT_new())
			== NULL) goto err;
		ASN1_INTEGER_set(p7->d.encrypted->version,0);
199 200
		p7->d.encrypted->enc_data->content_type
						= OBJ_nid2obj(NID_pkcs7_data);
201 202 203
		break;

	case NID_pkcs7_digest:
204 205 206 207 208
		p7->type=obj;
		if ((p7->d.digest=PKCS7_DIGEST_new())
			== NULL) goto err;
		ASN1_INTEGER_set(p7->d.digest->version,0);
		break;
209 210 211 212 213 214 215 216 217
	default:
		PKCS7err(PKCS7_F_PKCS7_SET_TYPE,PKCS7_R_UNSUPPORTED_CONTENT_TYPE);
		goto err;
		}
	return(1);
err:
	return(0);
	}

218 219 220 221 222 223 224
int PKCS7_set0_type_other(PKCS7 *p7, int type, ASN1_TYPE *other)
	{
	p7->type = OBJ_nid2obj(type);
	p7->d.other = other;
	return 1;
	}

U
Ulf Möller 已提交
225
int PKCS7_add_signer(PKCS7 *p7, PKCS7_SIGNER_INFO *psi)
226 227 228
	{
	int i,j,nid;
	X509_ALGOR *alg;
B
Stack.  
Ben Laurie 已提交
229
	STACK_OF(PKCS7_SIGNER_INFO) *signer_sk;
B
Stack.  
Ben Laurie 已提交
230
	STACK_OF(X509_ALGOR) *md_sk;
231 232

	i=OBJ_obj2nid(p7->type);
233
	switch (i)
234
		{
235 236 237 238 239 240 241 242 243
	case NID_pkcs7_signed:
		signer_sk=	p7->d.sign->signer_info;
		md_sk=		p7->d.sign->md_algs;
		break;
	case NID_pkcs7_signedAndEnveloped:
		signer_sk=	p7->d.signed_and_enveloped->signer_info;
		md_sk=		p7->d.signed_and_enveloped->md_algs;
		break;
	default:
244 245 246 247 248 249 250 251
		PKCS7err(PKCS7_F_PKCS7_ADD_SIGNER,PKCS7_R_WRONG_CONTENT_TYPE);
		return(0);
		}

	nid=OBJ_obj2nid(psi->digest_alg->algorithm);

	/* If the digest is not currently listed, add it */
	j=0;
B
Stack.  
Ben Laurie 已提交
252
	for (i=0; i<sk_X509_ALGOR_num(md_sk); i++)
253
		{
B
Stack.  
Ben Laurie 已提交
254
		alg=sk_X509_ALGOR_value(md_sk,i);
255 256 257 258 259 260 261 262
		if (OBJ_obj2nid(alg->algorithm) == nid)
			{
			j=1;
			break;
			}
		}
	if (!j) /* we need to add another algorithm */
		{
D
Dr. Stephen Henson 已提交
263 264 265 266 267
		if(!(alg=X509_ALGOR_new())
			|| !(alg->parameter = ASN1_TYPE_new())) {
			PKCS7err(PKCS7_F_PKCS7_ADD_SIGNER,ERR_R_MALLOC_FAILURE);
			return(0);
		}
268
		alg->algorithm=OBJ_nid2obj(nid);
D
Dr. Stephen Henson 已提交
269
		alg->parameter->type = V_ASN1_NULL;
B
Stack.  
Ben Laurie 已提交
270
		sk_X509_ALGOR_push(md_sk,alg);
271 272
		}

B
Stack.  
Ben Laurie 已提交
273
	sk_PKCS7_SIGNER_INFO_push(signer_sk,psi);
274 275 276
	return(1);
	}

U
Ulf Möller 已提交
277
int PKCS7_add_certificate(PKCS7 *p7, X509 *x509)
278 279
	{
	int i;
B
Ben Laurie 已提交
280
	STACK_OF(X509) **sk;
281 282

	i=OBJ_obj2nid(p7->type);
283
	switch (i)
284
		{
285 286 287 288 289 290 291 292
	case NID_pkcs7_signed:
		sk= &(p7->d.sign->cert);
		break;
	case NID_pkcs7_signedAndEnveloped:
		sk= &(p7->d.signed_and_enveloped->cert);
		break;
	default:
		PKCS7err(PKCS7_F_PKCS7_ADD_CERTIFICATE,PKCS7_R_WRONG_CONTENT_TYPE);
293 294 295
		return(0);
		}

296
	if (*sk == NULL)
B
Ben Laurie 已提交
297
		*sk=sk_X509_new_null();
298
	CRYPTO_add(&x509->references,1,CRYPTO_LOCK_X509);
B
Ben Laurie 已提交
299
	sk_X509_push(*sk,x509);
300 301 302
	return(1);
	}

U
Ulf Möller 已提交
303
int PKCS7_add_crl(PKCS7 *p7, X509_CRL *crl)
304 305
	{
	int i;
B
stack.  
Ben Laurie 已提交
306
	STACK_OF(X509_CRL) **sk;
307

308
	i=OBJ_obj2nid(p7->type);
309
	switch (i)
310
		{
311 312 313 314 315 316 317 318
	case NID_pkcs7_signed:
		sk= &(p7->d.sign->crl);
		break;
	case NID_pkcs7_signedAndEnveloped:
		sk= &(p7->d.signed_and_enveloped->crl);
		break;
	default:
		PKCS7err(PKCS7_F_PKCS7_ADD_CRL,PKCS7_R_WRONG_CONTENT_TYPE);
319 320 321
		return(0);
		}

322
	if (*sk == NULL)
B
stack.  
Ben Laurie 已提交
323
		*sk=sk_X509_CRL_new_null();
324 325

	CRYPTO_add(&crl->references,1,CRYPTO_LOCK_X509_CRL);
B
stack.  
Ben Laurie 已提交
326
	sk_X509_CRL_push(*sk,crl);
327 328 329
	return(1);
	}

U
Ulf Möller 已提交
330
int PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey,
D
 
Dr. Stephen Henson 已提交
331
	     const EVP_MD *dgst)
332
	{
333
	int nid;
334
	char is_dsa;
335

336
	if (pkey->type == EVP_PKEY_DSA || pkey->type == EVP_PKEY_EC)
337 338 339
		is_dsa = 1;
	else
		is_dsa = 0;
340 341 342 343 344 345 346
	/* We now need to add another PKCS7_SIGNER_INFO entry */
	ASN1_INTEGER_set(p7i->version,1);
	X509_NAME_set(&p7i->issuer_and_serial->issuer,
		X509_get_issuer_name(x509));

	/* because ASN1_INTEGER_set is used to set a 'long' we will do
	 * things the ugly way. */
347
	M_ASN1_INTEGER_free(p7i->issuer_and_serial->serial);
348
	p7i->issuer_and_serial->serial=
349
		M_ASN1_INTEGER_dup(X509_get_serialNumber(x509));
350 351 352 353 354 355

	/* lets keep the pkey around for a while */
	CRYPTO_add(&pkey->references,1,CRYPTO_LOCK_EVP_PKEY);
	p7i->pkey=pkey;

	/* Set the algorithms */
356
	if (is_dsa) p7i->digest_alg->algorithm=OBJ_nid2obj(NID_sha1);
357 358
	else	
		p7i->digest_alg->algorithm=OBJ_nid2obj(EVP_MD_type(dgst));
359

360 361 362 363 364 365
	if (p7i->digest_alg->parameter != NULL)
		ASN1_TYPE_free(p7i->digest_alg->parameter);
	if ((p7i->digest_alg->parameter=ASN1_TYPE_new()) == NULL)
		goto err;
	p7i->digest_alg->parameter->type=V_ASN1_NULL;

366 367
	if (p7i->digest_enc_alg->parameter != NULL)
		ASN1_TYPE_free(p7i->digest_enc_alg->parameter);
368 369 370 371
	nid = EVP_PKEY_type(pkey->type);
	if (nid == EVP_PKEY_RSA)
		{
		p7i->digest_enc_alg->algorithm=OBJ_nid2obj(NID_rsaEncryption);
372 373 374
		if (!(p7i->digest_enc_alg->parameter=ASN1_TYPE_new()))
			goto err;
		p7i->digest_enc_alg->parameter->type=V_ASN1_NULL;
375 376 377 378 379 380 381 382 383 384 385 386 387 388
		}
	else if (nid == EVP_PKEY_DSA)
		{
#if 1
		/* use 'dsaEncryption' OID for compatibility with other software
		 * (PKCS #7 v1.5 does specify how to handle DSA) ... */
		p7i->digest_enc_alg->algorithm=OBJ_nid2obj(NID_dsa);
#else
		/* ... although the 'dsaWithSHA1' OID (as required by RFC 2630 for CMS)
		 * would make more sense. */
		p7i->digest_enc_alg->algorithm=OBJ_nid2obj(NID_dsaWithSHA1);
#endif
		p7i->digest_enc_alg->parameter = NULL; /* special case for DSA: omit 'parameter'! */
		}
389
	else if (nid == EVP_PKEY_EC)
390 391 392 393 394 395 396 397
		{
		p7i->digest_enc_alg->algorithm=OBJ_nid2obj(NID_ecdsa_with_SHA1);
		if (!(p7i->digest_enc_alg->parameter=ASN1_TYPE_new()))
			goto err;
		p7i->digest_enc_alg->parameter->type=V_ASN1_NULL;
		}
	else
		return(0);
398 399 400 401 402 403

	return(1);
err:
	return(0);
	}

U
Ulf Möller 已提交
404
PKCS7_SIGNER_INFO *PKCS7_add_signature(PKCS7 *p7, X509 *x509, EVP_PKEY *pkey,
D
 
Dr. Stephen Henson 已提交
405
	     const EVP_MD *dgst)
406 407 408 409 410 411 412 413 414 415 416
	{
	PKCS7_SIGNER_INFO *si;

	if ((si=PKCS7_SIGNER_INFO_new()) == NULL) goto err;
	if (!PKCS7_SIGNER_INFO_set(si,x509,pkey,dgst)) goto err;
	if (!PKCS7_add_signer(p7,si)) goto err;
	return(si);
err:
	return(NULL);
	}

417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434
int PKCS7_set_digest(PKCS7 *p7, const EVP_MD *md)
	{
	if (PKCS7_type_is_digest(p7))
		{
		if(!(p7->d.digest->md->parameter = ASN1_TYPE_new()))
			{
			PKCS7err(PKCS7_F_PKCS7_SET_DIGEST,ERR_R_MALLOC_FAILURE);
			return 0;
			}
		p7->d.digest->md->parameter->type = V_ASN1_NULL;
		p7->d.digest->md->algorithm = OBJ_nid2obj(EVP_MD_nid(md));
		return 1;
		}
		
	PKCS7err(PKCS7_F_PKCS7_SET_DIGEST,PKCS7_R_WRONG_CONTENT_TYPE);
	return 1;
	}

B
Stack.  
Ben Laurie 已提交
435
STACK_OF(PKCS7_SIGNER_INFO) *PKCS7_get_signer_info(PKCS7 *p7)
436 437 438 439 440
	{
	if (PKCS7_type_is_signed(p7))
		{
		return(p7->d.sign->signer_info);
		}
441 442 443 444
	else if (PKCS7_type_is_signedAndEnveloped(p7))
		{
		return(p7->d.signed_and_enveloped->signer_info);
		}
445 446 447 448
	else
		return(NULL);
	}

U
Ulf Möller 已提交
449
PKCS7_RECIP_INFO *PKCS7_add_recipient(PKCS7 *p7, X509 *x509)
450 451 452 453 454 455 456 457 458 459 460
	{
	PKCS7_RECIP_INFO *ri;

	if ((ri=PKCS7_RECIP_INFO_new()) == NULL) goto err;
	if (!PKCS7_RECIP_INFO_set(ri,x509)) goto err;
	if (!PKCS7_add_recipient_info(p7,ri)) goto err;
	return(ri);
err:
	return(NULL);
	}

U
Ulf Möller 已提交
461
int PKCS7_add_recipient_info(PKCS7 *p7, PKCS7_RECIP_INFO *ri)
462 463
	{
	int i;
B
stack.  
Ben Laurie 已提交
464
	STACK_OF(PKCS7_RECIP_INFO) *sk;
465 466 467 468 469 470 471

	i=OBJ_obj2nid(p7->type);
	switch (i)
		{
	case NID_pkcs7_signedAndEnveloped:
		sk=	p7->d.signed_and_enveloped->recipientinfo;
		break;
472 473 474
	case NID_pkcs7_enveloped:
		sk=	p7->d.enveloped->recipientinfo;
		break;
475 476 477 478 479
	default:
		PKCS7err(PKCS7_F_PKCS7_ADD_RECIPIENT_INFO,PKCS7_R_WRONG_CONTENT_TYPE);
		return(0);
		}

B
stack.  
Ben Laurie 已提交
480
	sk_PKCS7_RECIP_INFO_push(sk,ri);
481 482 483
	return(1);
	}

U
Ulf Möller 已提交
484
int PKCS7_RECIP_INFO_set(PKCS7_RECIP_INFO *p7i, X509 *x509)
485 486 487 488 489
	{
	ASN1_INTEGER_set(p7i->version,0);
	X509_NAME_set(&p7i->issuer_and_serial->issuer,
		X509_get_issuer_name(x509));

490
	M_ASN1_INTEGER_free(p7i->issuer_and_serial->serial);
491
	p7i->issuer_and_serial->serial=
492
		M_ASN1_INTEGER_dup(X509_get_serialNumber(x509));
493

494
	X509_ALGOR_free(p7i->key_enc_algor);
495
	p7i->key_enc_algor= X509_ALGOR_dup(x509->cert_info->key->algor);
496

497 498 499 500 501 502
	CRYPTO_add(&x509->references,1,CRYPTO_LOCK_X509);
	p7i->cert=x509;

	return(1);
	}

U
Ulf Möller 已提交
503
X509 *PKCS7_cert_from_signer_info(PKCS7 *p7, PKCS7_SIGNER_INFO *si)
504 505 506 507 508 509 510 511 512
	{
	if (PKCS7_type_is_signed(p7))
		return(X509_find_by_issuer_and_serial(p7->d.sign->cert,
			si->issuer_and_serial->issuer,
			si->issuer_and_serial->serial));
	else
		return(NULL);
	}

513
int PKCS7_set_cipher(PKCS7 *p7, const EVP_CIPHER *cipher)
514 515
	{
	int i;
516
	ASN1_OBJECT *objtmp;
517 518 519 520 521 522 523 524
	PKCS7_ENC_CONTENT *ec;

	i=OBJ_obj2nid(p7->type);
	switch (i)
		{
	case NID_pkcs7_signedAndEnveloped:
		ec=p7->d.signed_and_enveloped->enc_data;
		break;
525 526 527
	case NID_pkcs7_enveloped:
		ec=p7->d.enveloped->enc_data;
		break;
528 529 530 531 532
	default:
		PKCS7err(PKCS7_F_PKCS7_SET_CIPHER,PKCS7_R_WRONG_CONTENT_TYPE);
		return(0);
		}

533
	/* Check cipher OID exists and has data in it*/
D
Dr. Stephen Henson 已提交
534 535
	i = EVP_CIPHER_type(cipher);
	if(i == NID_undef) {
536 537 538
		PKCS7err(PKCS7_F_PKCS7_SET_CIPHER,PKCS7_R_CIPHER_HAS_NO_OBJECT_IDENTIFIER);
		return(0);
	}
D
Dr. Stephen Henson 已提交
539
	objtmp = OBJ_nid2obj(i);
540 541 542

	ec->cipher = cipher;
	return 1;
543 544
	}