Experimental streaming PKCS#7 support.
[openssl.git] / crypto / pkcs7 / pk7_lib.c
1 /* crypto/pkcs7/pk7_lib.c */
2 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3  * All rights reserved.
4  *
5  * This package is an SSL implementation written
6  * by Eric Young (eay@cryptsoft.com).
7  * The implementation was written so as to conform with Netscapes SSL.
8  * 
9  * This library is free for commercial and non-commercial use as long as
10  * the following conditions are aheared to.  The following conditions
11  * apply to all code found in this distribution, be it the RC4, RSA,
12  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
13  * included with this distribution is covered by the same copyright terms
14  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
15  * 
16  * Copyright remains Eric Young's, and as such any Copyright notices in
17  * the code are not to be removed.
18  * If this package is used in a product, Eric Young should be given attribution
19  * as the author of the parts of the library used.
20  * This can be in the form of a textual message at program startup or
21  * in documentation (online or textual) provided with the package.
22  * 
23  * Redistribution and use in source and binary forms, with or without
24  * modification, are permitted provided that the following conditions
25  * are met:
26  * 1. Redistributions of source code must retain the copyright
27  *    notice, this list of conditions and the following disclaimer.
28  * 2. Redistributions in binary form must reproduce the above copyright
29  *    notice, this list of conditions and the following disclaimer in the
30  *    documentation and/or other materials provided with the distribution.
31  * 3. All advertising materials mentioning features or use of this software
32  *    must display the following acknowledgement:
33  *    "This product includes cryptographic software written by
34  *     Eric Young (eay@cryptsoft.com)"
35  *    The word 'cryptographic' can be left out if the rouines from the library
36  *    being used are not cryptographic related :-).
37  * 4. If you include any Windows specific code (or a derivative thereof) from 
38  *    the apps directory (application code) you must include an acknowledgement:
39  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
40  * 
41  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
42  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
43  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
44  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
45  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
46  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
47  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
48  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
49  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
50  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
51  * SUCH DAMAGE.
52  * 
53  * The licence and distribution terms for any publically available version or
54  * derivative of this code cannot be changed.  i.e. this code cannot simply be
55  * copied and put under another distribution licence
56  * [including the GNU Public Licence.]
57  */
58
59 #include <stdio.h>
60 #include "cryptlib.h"
61 #include <openssl/objects.h>
62 #include <openssl/x509.h>
63 #include "asn1_locl.h"
64
65 long PKCS7_ctrl(PKCS7 *p7, int cmd, long larg, char *parg)
66         {
67         int nid;
68         long ret;
69
70         nid=OBJ_obj2nid(p7->type);
71
72         switch (cmd)
73                 {
74         case PKCS7_OP_SET_DETACHED_SIGNATURE:
75                 if (nid == NID_pkcs7_signed)
76                         {
77                         ret=p7->detached=(int)larg;
78                         if (ret && PKCS7_type_is_data(p7->d.sign->contents))
79                                         {
80                                         ASN1_OCTET_STRING *os;
81                                         os=p7->d.sign->contents->d.data;
82                                         ASN1_OCTET_STRING_free(os);
83                                         p7->d.sign->contents->d.data = NULL;
84                                         }
85                         }
86                 else
87                         {
88                         PKCS7err(PKCS7_F_PKCS7_CTRL,PKCS7_R_OPERATION_NOT_SUPPORTED_ON_THIS_TYPE);
89                         ret=0;
90                         }
91                 break;
92         case PKCS7_OP_GET_DETACHED_SIGNATURE:
93                 if (nid == NID_pkcs7_signed)
94                         {
95                         if(!p7->d.sign  || !p7->d.sign->contents->d.ptr)
96                                 ret = 1;
97                         else ret = 0;
98                                 
99                         p7->detached = ret;
100                         }
101                 else
102                         {
103                         PKCS7err(PKCS7_F_PKCS7_CTRL,PKCS7_R_OPERATION_NOT_SUPPORTED_ON_THIS_TYPE);
104                         ret=0;
105                         }
106                         
107                 break;
108         default:
109                 PKCS7err(PKCS7_F_PKCS7_CTRL,PKCS7_R_UNKNOWN_OPERATION);
110                 ret=0;
111                 }
112         return(ret);
113         }
114
115 int PKCS7_content_new(PKCS7 *p7, int type)
116         {
117         PKCS7 *ret=NULL;
118
119         if ((ret=PKCS7_new()) == NULL) goto err;
120         if (!PKCS7_set_type(ret,type)) goto err;
121         if (!PKCS7_set_content(p7,ret)) goto err;
122
123         return(1);
124 err:
125         if (ret != NULL) PKCS7_free(ret);
126         return(0);
127         }
128
129 int PKCS7_set_content(PKCS7 *p7, PKCS7 *p7_data)
130         {
131         int i;
132
133         i=OBJ_obj2nid(p7->type);
134         switch (i)
135                 {
136         case NID_pkcs7_signed:
137                 if (p7->d.sign->contents != NULL)
138                         PKCS7_free(p7->d.sign->contents);
139                 p7->d.sign->contents=p7_data;
140                 break;
141         case NID_pkcs7_digest:
142                 if (p7->d.digest->contents != NULL)
143                         PKCS7_free(p7->d.digest->contents);
144                 p7->d.digest->contents=p7_data;
145                 break;
146         case NID_pkcs7_data:
147         case NID_pkcs7_enveloped:
148         case NID_pkcs7_signedAndEnveloped:
149         case NID_pkcs7_encrypted:
150         default:
151                 PKCS7err(PKCS7_F_PKCS7_SET_CONTENT,PKCS7_R_UNSUPPORTED_CONTENT_TYPE);
152                 goto err;
153                 }
154         return(1);
155 err:
156         return(0);
157         }
158
159 int PKCS7_set_type(PKCS7 *p7, int type)
160         {
161         ASN1_OBJECT *obj;
162
163         /*PKCS7_content_free(p7);*/
164         obj=OBJ_nid2obj(type); /* will not fail */
165
166         switch (type)
167                 {
168         case NID_pkcs7_signed:
169                 p7->type=obj;
170                 if ((p7->d.sign=PKCS7_SIGNED_new()) == NULL)
171                         goto err;
172                 if (!ASN1_INTEGER_set(p7->d.sign->version,1))
173                         {
174                         PKCS7_SIGNED_free(p7->d.sign);
175                         p7->d.sign=NULL;
176                         goto err;
177                         }
178                 break;
179         case NID_pkcs7_data:
180                 p7->type=obj;
181                 if ((p7->d.data=M_ASN1_OCTET_STRING_new()) == NULL)
182                         goto err;
183                 break;
184         case NID_pkcs7_signedAndEnveloped:
185                 p7->type=obj;
186                 if ((p7->d.signed_and_enveloped=PKCS7_SIGN_ENVELOPE_new())
187                         == NULL) goto err;
188                 ASN1_INTEGER_set(p7->d.signed_and_enveloped->version,1);
189                 if (!ASN1_INTEGER_set(p7->d.signed_and_enveloped->version,1))
190                         goto err;
191                 p7->d.signed_and_enveloped->enc_data->content_type
192                                                 = OBJ_nid2obj(NID_pkcs7_data);
193                 break;
194         case NID_pkcs7_enveloped:
195                 p7->type=obj;
196                 if ((p7->d.enveloped=PKCS7_ENVELOPE_new())
197                         == NULL) goto err;
198                 if (!ASN1_INTEGER_set(p7->d.enveloped->version,0))
199                         goto err;
200                 p7->d.enveloped->enc_data->content_type
201                                                 = OBJ_nid2obj(NID_pkcs7_data);
202                 break;
203         case NID_pkcs7_encrypted:
204                 p7->type=obj;
205                 if ((p7->d.encrypted=PKCS7_ENCRYPT_new())
206                         == NULL) goto err;
207                 if (!ASN1_INTEGER_set(p7->d.encrypted->version,0))
208                         goto err;
209                 p7->d.encrypted->enc_data->content_type
210                                                 = OBJ_nid2obj(NID_pkcs7_data);
211                 break;
212
213         case NID_pkcs7_digest:
214                 p7->type=obj;
215                 if ((p7->d.digest=PKCS7_DIGEST_new())
216                         == NULL) goto err;
217                 if (!ASN1_INTEGER_set(p7->d.digest->version,0))
218                         goto err;
219                 break;
220         default:
221                 PKCS7err(PKCS7_F_PKCS7_SET_TYPE,PKCS7_R_UNSUPPORTED_CONTENT_TYPE);
222                 goto err;
223                 }
224         return(1);
225 err:
226         return(0);
227         }
228
229 int PKCS7_set0_type_other(PKCS7 *p7, int type, ASN1_TYPE *other)
230         {
231         p7->type = OBJ_nid2obj(type);
232         p7->d.other = other;
233         return 1;
234         }
235
236 int PKCS7_add_signer(PKCS7 *p7, PKCS7_SIGNER_INFO *psi)
237         {
238         int i,j,nid;
239         X509_ALGOR *alg;
240         STACK_OF(PKCS7_SIGNER_INFO) *signer_sk;
241         STACK_OF(X509_ALGOR) *md_sk;
242
243         i=OBJ_obj2nid(p7->type);
244         switch (i)
245                 {
246         case NID_pkcs7_signed:
247                 signer_sk=      p7->d.sign->signer_info;
248                 md_sk=          p7->d.sign->md_algs;
249                 break;
250         case NID_pkcs7_signedAndEnveloped:
251                 signer_sk=      p7->d.signed_and_enveloped->signer_info;
252                 md_sk=          p7->d.signed_and_enveloped->md_algs;
253                 break;
254         default:
255                 PKCS7err(PKCS7_F_PKCS7_ADD_SIGNER,PKCS7_R_WRONG_CONTENT_TYPE);
256                 return(0);
257                 }
258
259         nid=OBJ_obj2nid(psi->digest_alg->algorithm);
260
261         /* If the digest is not currently listed, add it */
262         j=0;
263         for (i=0; i<sk_X509_ALGOR_num(md_sk); i++)
264                 {
265                 alg=sk_X509_ALGOR_value(md_sk,i);
266                 if (OBJ_obj2nid(alg->algorithm) == nid)
267                         {
268                         j=1;
269                         break;
270                         }
271                 }
272         if (!j) /* we need to add another algorithm */
273                 {
274                 if(!(alg=X509_ALGOR_new())
275                         || !(alg->parameter = ASN1_TYPE_new())) {
276                         PKCS7err(PKCS7_F_PKCS7_ADD_SIGNER,ERR_R_MALLOC_FAILURE);
277                         return(0);
278                 }
279                 alg->algorithm=OBJ_nid2obj(nid);
280                 alg->parameter->type = V_ASN1_NULL;
281                 sk_X509_ALGOR_push(md_sk,alg);
282                 }
283
284         sk_PKCS7_SIGNER_INFO_push(signer_sk,psi);
285         return(1);
286         }
287
288 int PKCS7_add_certificate(PKCS7 *p7, X509 *x509)
289         {
290         int i;
291         STACK_OF(X509) **sk;
292
293         i=OBJ_obj2nid(p7->type);
294         switch (i)
295                 {
296         case NID_pkcs7_signed:
297                 sk= &(p7->d.sign->cert);
298                 break;
299         case NID_pkcs7_signedAndEnveloped:
300                 sk= &(p7->d.signed_and_enveloped->cert);
301                 break;
302         default:
303                 PKCS7err(PKCS7_F_PKCS7_ADD_CERTIFICATE,PKCS7_R_WRONG_CONTENT_TYPE);
304                 return(0);
305                 }
306
307         if (*sk == NULL)
308                 *sk=sk_X509_new_null();
309         CRYPTO_add(&x509->references,1,CRYPTO_LOCK_X509);
310         sk_X509_push(*sk,x509);
311         return(1);
312         }
313
314 int PKCS7_add_crl(PKCS7 *p7, X509_CRL *crl)
315         {
316         int i;
317         STACK_OF(X509_CRL) **sk;
318
319         i=OBJ_obj2nid(p7->type);
320         switch (i)
321                 {
322         case NID_pkcs7_signed:
323                 sk= &(p7->d.sign->crl);
324                 break;
325         case NID_pkcs7_signedAndEnveloped:
326                 sk= &(p7->d.signed_and_enveloped->crl);
327                 break;
328         default:
329                 PKCS7err(PKCS7_F_PKCS7_ADD_CRL,PKCS7_R_WRONG_CONTENT_TYPE);
330                 return(0);
331                 }
332
333         if (*sk == NULL)
334                 *sk=sk_X509_CRL_new_null();
335
336         CRYPTO_add(&crl->references,1,CRYPTO_LOCK_X509_CRL);
337         sk_X509_CRL_push(*sk,crl);
338         return(1);
339         }
340
341 int PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey,
342              const EVP_MD *dgst)
343         {
344         int ret;
345
346         /* We now need to add another PKCS7_SIGNER_INFO entry */
347         if (!ASN1_INTEGER_set(p7i->version,1))
348                 goto err;
349         if (!X509_NAME_set(&p7i->issuer_and_serial->issuer,
350                         X509_get_issuer_name(x509)))
351                 goto err;
352
353         /* because ASN1_INTEGER_set is used to set a 'long' we will do
354          * things the ugly way. */
355         M_ASN1_INTEGER_free(p7i->issuer_and_serial->serial);
356         if (!(p7i->issuer_and_serial->serial=
357                         M_ASN1_INTEGER_dup(X509_get_serialNumber(x509))))
358                 goto err;
359
360         /* lets keep the pkey around for a while */
361         CRYPTO_add(&pkey->references,1,CRYPTO_LOCK_EVP_PKEY);
362         p7i->pkey=pkey;
363
364         /* Set the algorithms */
365
366         X509_ALGOR_set0(p7i->digest_alg, OBJ_nid2obj(EVP_MD_type(dgst)),
367                                 V_ASN1_NULL, NULL);
368
369         if (pkey->ameth && pkey->ameth->pkey_ctrl)
370                 {
371                 ret = pkey->ameth->pkey_ctrl(pkey, ASN1_PKEY_CTRL_PKCS7_SIGN,
372                                                 0, p7i);
373                 if (ret > 0)
374                         return 1;
375                 if (ret != -2)
376                         {
377                         PKCS7err(PKCS7_F_PKCS7_SIGNER_INFO_SET,
378                                         PKCS7_R_SIGNING_CTRL_FAILURE);
379                         return 0;
380                         }
381                 }
382         PKCS7err(PKCS7_F_PKCS7_SIGNER_INFO_SET,
383                         PKCS7_R_SIGNING_NOT_SUPPORTED_FOR_THIS_KEY_TYPE);
384 err:
385         return 0;
386         }
387
388 PKCS7_SIGNER_INFO *PKCS7_add_signature(PKCS7 *p7, X509 *x509, EVP_PKEY *pkey,
389              const EVP_MD *dgst)
390         {
391         PKCS7_SIGNER_INFO *si = NULL;
392
393         if (dgst == NULL)
394                 {
395                 int def_nid;
396                 if (EVP_PKEY_get_default_digest_nid(pkey, &def_nid) <= 0)
397                         goto err;
398                 dgst = EVP_get_digestbynid(def_nid);
399                 if (dgst == NULL)
400                         {
401                         PKCS7err(PKCS7_F_PKCS7_ADD_SIGNATURE,
402                                                 PKCS7_R_NO_DEFAULT_DIGEST);
403                         goto err;
404                         }
405                 }
406
407         if ((si=PKCS7_SIGNER_INFO_new()) == NULL) goto err;
408         if (!PKCS7_SIGNER_INFO_set(si,x509,pkey,dgst)) goto err;
409         if (!PKCS7_add_signer(p7,si)) goto err;
410         return(si);
411 err:
412         if (si)
413                 PKCS7_SIGNER_INFO_free(si);
414         return(NULL);
415         }
416
417 int PKCS7_set_digest(PKCS7 *p7, const EVP_MD *md)
418         {
419         if (PKCS7_type_is_digest(p7))
420                 {
421                 if(!(p7->d.digest->md->parameter = ASN1_TYPE_new()))
422                         {
423                         PKCS7err(PKCS7_F_PKCS7_SET_DIGEST,ERR_R_MALLOC_FAILURE);
424                         return 0;
425                         }
426                 p7->d.digest->md->parameter->type = V_ASN1_NULL;
427                 p7->d.digest->md->algorithm = OBJ_nid2obj(EVP_MD_nid(md));
428                 return 1;
429                 }
430                 
431         PKCS7err(PKCS7_F_PKCS7_SET_DIGEST,PKCS7_R_WRONG_CONTENT_TYPE);
432         return 1;
433         }
434
435 STACK_OF(PKCS7_SIGNER_INFO) *PKCS7_get_signer_info(PKCS7 *p7)
436         {
437         if (PKCS7_type_is_signed(p7))
438                 {
439                 return(p7->d.sign->signer_info);
440                 }
441         else if (PKCS7_type_is_signedAndEnveloped(p7))
442                 {
443                 return(p7->d.signed_and_enveloped->signer_info);
444                 }
445         else
446                 return(NULL);
447         }
448
449 void PKCS7_SIGNER_INFO_get0_algs(PKCS7_SIGNER_INFO *si, EVP_PKEY **pk,
450                                         X509_ALGOR **pdig, X509_ALGOR **psig)
451         {
452         if (pk)
453                 *pk = si->pkey;
454         if (pdig)
455                 *pdig = si->digest_alg;
456         if (psig)
457                 *psig = si->digest_enc_alg;
458         }
459
460 void PKCS7_RECIP_INFO_get0_alg(PKCS7_RECIP_INFO *ri, X509_ALGOR **penc)
461         {
462         if (penc)
463                 *penc = ri->key_enc_algor;
464         }
465
466 PKCS7_RECIP_INFO *PKCS7_add_recipient(PKCS7 *p7, X509 *x509)
467         {
468         PKCS7_RECIP_INFO *ri;
469
470         if ((ri=PKCS7_RECIP_INFO_new()) == NULL) goto err;
471         if (!PKCS7_RECIP_INFO_set(ri,x509)) goto err;
472         if (!PKCS7_add_recipient_info(p7,ri)) goto err;
473         return ri;
474 err:
475         if (ri)
476                 PKCS7_RECIP_INFO_free(ri);
477         return NULL;
478         }
479
480 int PKCS7_add_recipient_info(PKCS7 *p7, PKCS7_RECIP_INFO *ri)
481         {
482         int i;
483         STACK_OF(PKCS7_RECIP_INFO) *sk;
484
485         i=OBJ_obj2nid(p7->type);
486         switch (i)
487                 {
488         case NID_pkcs7_signedAndEnveloped:
489                 sk=     p7->d.signed_and_enveloped->recipientinfo;
490                 break;
491         case NID_pkcs7_enveloped:
492                 sk=     p7->d.enveloped->recipientinfo;
493                 break;
494         default:
495                 PKCS7err(PKCS7_F_PKCS7_ADD_RECIPIENT_INFO,PKCS7_R_WRONG_CONTENT_TYPE);
496                 return(0);
497                 }
498
499         sk_PKCS7_RECIP_INFO_push(sk,ri);
500         return(1);
501         }
502
503 int PKCS7_RECIP_INFO_set(PKCS7_RECIP_INFO *p7i, X509 *x509)
504         {
505         int ret;
506         EVP_PKEY *pkey = NULL;
507         if (!ASN1_INTEGER_set(p7i->version,0))
508                 return 0;
509         if (!X509_NAME_set(&p7i->issuer_and_serial->issuer,
510                 X509_get_issuer_name(x509)))
511                 return 0;
512
513         M_ASN1_INTEGER_free(p7i->issuer_and_serial->serial);
514         if (!(p7i->issuer_and_serial->serial=
515                 M_ASN1_INTEGER_dup(X509_get_serialNumber(x509))))
516                 return 0;
517
518         pkey = X509_get_pubkey(x509);
519
520         if (!pkey || !pkey->ameth || !pkey->ameth->pkey_ctrl)
521                 {
522                 PKCS7err(PKCS7_F_PKCS7_RECIP_INFO_SET,
523                         PKCS7_R_ENCRYPTION_NOT_SUPPORTED_FOR_THIS_KEY_TYPE);
524                 goto err;
525                 }
526
527         ret = pkey->ameth->pkey_ctrl(pkey, ASN1_PKEY_CTRL_PKCS7_ENCRYPT,
528                                                 0, p7i);
529         if (ret == -2)
530                 {
531                 PKCS7err(PKCS7_F_PKCS7_RECIP_INFO_SET,
532                         PKCS7_R_ENCRYPTION_NOT_SUPPORTED_FOR_THIS_KEY_TYPE);
533                 goto err;
534                 }
535         if (ret <= 0)
536                 {
537                 PKCS7err(PKCS7_F_PKCS7_RECIP_INFO_SET,
538                                 PKCS7_R_ENCRYPTION_CTRL_FAILURE);
539                 goto err;
540                 }
541
542         EVP_PKEY_free(pkey);
543
544         CRYPTO_add(&x509->references,1,CRYPTO_LOCK_X509);
545         p7i->cert=x509;
546
547         return 1;
548
549         err:
550         if (pkey)
551                 EVP_PKEY_free(pkey);
552         return 0;
553         }
554
555 X509 *PKCS7_cert_from_signer_info(PKCS7 *p7, PKCS7_SIGNER_INFO *si)
556         {
557         if (PKCS7_type_is_signed(p7))
558                 return(X509_find_by_issuer_and_serial(p7->d.sign->cert,
559                         si->issuer_and_serial->issuer,
560                         si->issuer_and_serial->serial));
561         else
562                 return(NULL);
563         }
564
565 int PKCS7_set_cipher(PKCS7 *p7, const EVP_CIPHER *cipher)
566         {
567         int i;
568         ASN1_OBJECT *objtmp;
569         PKCS7_ENC_CONTENT *ec;
570
571         i=OBJ_obj2nid(p7->type);
572         switch (i)
573                 {
574         case NID_pkcs7_signedAndEnveloped:
575                 ec=p7->d.signed_and_enveloped->enc_data;
576                 break;
577         case NID_pkcs7_enveloped:
578                 ec=p7->d.enveloped->enc_data;
579                 break;
580         default:
581                 PKCS7err(PKCS7_F_PKCS7_SET_CIPHER,PKCS7_R_WRONG_CONTENT_TYPE);
582                 return(0);
583                 }
584
585         /* Check cipher OID exists and has data in it*/
586         i = EVP_CIPHER_type(cipher);
587         if(i == NID_undef) {
588                 PKCS7err(PKCS7_F_PKCS7_SET_CIPHER,PKCS7_R_CIPHER_HAS_NO_OBJECT_IDENTIFIER);
589                 return(0);
590         }
591         objtmp = OBJ_nid2obj(i);
592
593         ec->cipher = cipher;
594         return 1;
595         }
596
597 int PKCS7_stream(unsigned char ***boundary, PKCS7 *p7)
598         {
599         ASN1_OCTET_STRING *os = NULL;
600
601         switch (OBJ_obj2nid(p7->type))
602                 {
603                 case NID_pkcs7_data:
604                 os = p7->d.data;
605                 break;
606
607                 case NID_pkcs7_signedAndEnveloped:
608                 os = p7->d.signed_and_enveloped->enc_data->enc_data;
609                 if (os == NULL)
610                         {
611                         os=M_ASN1_OCTET_STRING_new();
612                         p7->d.signed_and_enveloped->enc_data->enc_data=os;
613                         }
614                 break;
615
616                 case NID_pkcs7_enveloped:
617                 os = p7->d.enveloped->enc_data->enc_data;
618                 if (os == NULL)
619                         {
620                         os=M_ASN1_OCTET_STRING_new();
621                         p7->d.enveloped->enc_data->enc_data=os;
622                         }
623                 break;
624
625                 case NID_pkcs7_signed:
626                 os=p7->d.sign->contents->d.data;
627                 break;
628
629                 default:
630                 os = NULL;
631                 break;
632                 }
633         
634         if (os == NULL)
635                 return 0;
636
637         os->flags |= ASN1_STRING_FLAG_NDEF;
638         *boundary = &os->data;
639
640         return 1;
641         }
642
643
644
645
646