Merge branch 'vendor/OPENSSL'
[dragonfly.git] / crypto / openssl / crypto / pkcs7 / pk7_doit.c
1 /* crypto/pkcs7/pk7_doit.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/rand.h>
62 #include <openssl/objects.h>
63 #include <openssl/x509.h>
64 #include <openssl/x509v3.h>
65 #include <openssl/err.h>
66
67 static int add_attribute(STACK_OF(X509_ATTRIBUTE) **sk, int nid, int atrtype,
68                          void *value);
69 static ASN1_TYPE *get_attribute(STACK_OF(X509_ATTRIBUTE) *sk, int nid);
70
71 static int PKCS7_type_is_other(PKCS7* p7)
72         {
73         int isOther=1;
74         
75         int nid=OBJ_obj2nid(p7->type);
76
77         switch( nid )
78                 {
79         case NID_pkcs7_data:
80         case NID_pkcs7_signed:
81         case NID_pkcs7_enveloped:
82         case NID_pkcs7_signedAndEnveloped:
83         case NID_pkcs7_digest:
84         case NID_pkcs7_encrypted:
85                 isOther=0;
86                 break;
87         default:
88                 isOther=1;
89                 }
90
91         return isOther;
92
93         }
94
95 static ASN1_OCTET_STRING *PKCS7_get_octet_string(PKCS7 *p7)
96         {
97         if ( PKCS7_type_is_data(p7))
98                 return p7->d.data;
99         if ( PKCS7_type_is_other(p7) && p7->d.other
100                 && (p7->d.other->type == V_ASN1_OCTET_STRING))
101                 return p7->d.other->value.octet_string;
102         return NULL;
103         }
104
105 static int PKCS7_bio_add_digest(BIO **pbio, X509_ALGOR *alg)
106         {
107         BIO *btmp;
108         const EVP_MD *md;
109         if ((btmp=BIO_new(BIO_f_md())) == NULL)
110                 {
111                 PKCS7err(PKCS7_F_PKCS7_BIO_ADD_DIGEST,ERR_R_BIO_LIB);
112                 goto err;
113                 }
114
115         md=EVP_get_digestbyobj(alg->algorithm);
116         if (md == NULL)
117                 {
118                 PKCS7err(PKCS7_F_PKCS7_BIO_ADD_DIGEST,PKCS7_R_UNKNOWN_DIGEST_TYPE);
119                 goto err;
120                 }
121
122         BIO_set_md(btmp,md);
123         if (*pbio == NULL)
124                 *pbio=btmp;
125         else if (!BIO_push(*pbio,btmp))
126                 {
127                 PKCS7err(PKCS7_F_PKCS7_BIO_ADD_DIGEST,ERR_R_BIO_LIB);
128                 goto err;
129                 }
130         btmp=NULL;
131
132         return 1;
133
134         err:
135         if (btmp)
136                 BIO_free(btmp);
137         return 0;
138
139         }
140
141 static int pkcs7_encode_rinfo(PKCS7_RECIP_INFO *ri,
142                                         unsigned char *key, int keylen)
143         {
144         EVP_PKEY_CTX *pctx = NULL;
145         EVP_PKEY *pkey = NULL;
146         unsigned char *ek = NULL;
147         int ret = 0;
148         size_t eklen;
149
150         pkey = X509_get_pubkey(ri->cert);
151
152         if (!pkey)
153                 return 0;
154
155         pctx = EVP_PKEY_CTX_new(pkey, NULL);
156         if (!pctx)
157                 return 0;
158
159         if (EVP_PKEY_encrypt_init(pctx) <= 0)
160                 goto err;
161
162         if (EVP_PKEY_CTX_ctrl(pctx, -1, EVP_PKEY_OP_ENCRYPT,
163                                 EVP_PKEY_CTRL_PKCS7_ENCRYPT, 0, ri) <= 0)
164                 {
165                 PKCS7err(PKCS7_F_PKCS7_ENCODE_RINFO, PKCS7_R_CTRL_ERROR);
166                 goto err;
167                 }
168
169         if (EVP_PKEY_encrypt(pctx, NULL, &eklen, key, keylen) <= 0)
170                 goto err;
171
172         ek = OPENSSL_malloc(eklen);
173
174         if (ek == NULL)
175                 {
176                 PKCS7err(PKCS7_F_PKCS7_ENCODE_RINFO, ERR_R_MALLOC_FAILURE);
177                 goto err;
178                 }
179
180         if (EVP_PKEY_encrypt(pctx, ek, &eklen, key, keylen) <= 0)
181                 goto err;
182
183         ASN1_STRING_set0(ri->enc_key, ek, eklen);
184         ek = NULL;
185
186         ret = 1;
187
188         err:
189         if (pkey)
190                 EVP_PKEY_free(pkey);
191         if (pctx)
192                 EVP_PKEY_CTX_free(pctx);
193         if (ek)
194                 OPENSSL_free(ek);
195         return ret;
196
197         }
198
199
200 static int pkcs7_decrypt_rinfo(unsigned char **pek, int *peklen,
201                                PKCS7_RECIP_INFO *ri, EVP_PKEY *pkey)
202         {
203         EVP_PKEY_CTX *pctx = NULL;
204         unsigned char *ek = NULL;
205         size_t eklen;
206
207         int ret = -1;
208
209         pctx = EVP_PKEY_CTX_new(pkey, NULL);
210         if (!pctx)
211                 return -1;
212
213         if (EVP_PKEY_decrypt_init(pctx) <= 0)
214                 goto err;
215
216         if (EVP_PKEY_CTX_ctrl(pctx, -1, EVP_PKEY_OP_DECRYPT,
217                                 EVP_PKEY_CTRL_PKCS7_DECRYPT, 0, ri) <= 0)
218                 {
219                 PKCS7err(PKCS7_F_PKCS7_DECRYPT_RINFO, PKCS7_R_CTRL_ERROR);
220                 goto err;
221                 }
222
223         if (EVP_PKEY_decrypt(pctx, NULL, &eklen,
224                                 ri->enc_key->data, ri->enc_key->length) <= 0)
225                 goto err;
226
227         ek = OPENSSL_malloc(eklen);
228
229         if (ek == NULL)
230                 {
231                 PKCS7err(PKCS7_F_PKCS7_DECRYPT_RINFO, ERR_R_MALLOC_FAILURE);
232                 goto err;
233                 }
234
235         if (EVP_PKEY_decrypt(pctx, ek, &eklen,
236                                 ri->enc_key->data, ri->enc_key->length) <= 0)
237                 {
238                 ret = 0;
239                 PKCS7err(PKCS7_F_PKCS7_DECRYPT_RINFO, ERR_R_EVP_LIB);
240                 goto err;
241                 }
242
243         ret = 1;
244
245         if (*pek)
246                 {
247                 OPENSSL_cleanse(*pek, *peklen);
248                 OPENSSL_free(*pek);
249                 }
250
251         *pek = ek;
252         *peklen = eklen;
253
254         err:
255         if (pctx)
256                 EVP_PKEY_CTX_free(pctx);
257         if (!ret && ek)
258                 OPENSSL_free(ek);
259
260         return ret;
261         }
262
263 BIO *PKCS7_dataInit(PKCS7 *p7, BIO *bio)
264         {
265         int i;
266         BIO *out=NULL,*btmp=NULL;
267         X509_ALGOR *xa = NULL;
268         const EVP_CIPHER *evp_cipher=NULL;
269         STACK_OF(X509_ALGOR) *md_sk=NULL;
270         STACK_OF(PKCS7_RECIP_INFO) *rsk=NULL;
271         X509_ALGOR *xalg=NULL;
272         PKCS7_RECIP_INFO *ri=NULL;
273         ASN1_OCTET_STRING *os=NULL;
274
275         i=OBJ_obj2nid(p7->type);
276         p7->state=PKCS7_S_HEADER;
277
278         switch (i)
279                 {
280         case NID_pkcs7_signed:
281                 md_sk=p7->d.sign->md_algs;
282                 os = PKCS7_get_octet_string(p7->d.sign->contents);
283                 break;
284         case NID_pkcs7_signedAndEnveloped:
285                 rsk=p7->d.signed_and_enveloped->recipientinfo;
286                 md_sk=p7->d.signed_and_enveloped->md_algs;
287                 xalg=p7->d.signed_and_enveloped->enc_data->algorithm;
288                 evp_cipher=p7->d.signed_and_enveloped->enc_data->cipher;
289                 if (evp_cipher == NULL)
290                         {
291                         PKCS7err(PKCS7_F_PKCS7_DATAINIT,
292                                                 PKCS7_R_CIPHER_NOT_INITIALIZED);
293                         goto err;
294                         }
295                 break;
296         case NID_pkcs7_enveloped:
297                 rsk=p7->d.enveloped->recipientinfo;
298                 xalg=p7->d.enveloped->enc_data->algorithm;
299                 evp_cipher=p7->d.enveloped->enc_data->cipher;
300                 if (evp_cipher == NULL)
301                         {
302                         PKCS7err(PKCS7_F_PKCS7_DATAINIT,
303                                                 PKCS7_R_CIPHER_NOT_INITIALIZED);
304                         goto err;
305                         }
306                 break;
307         case NID_pkcs7_digest:
308                 xa = p7->d.digest->md;
309                 os = PKCS7_get_octet_string(p7->d.digest->contents);
310                 break;
311         case NID_pkcs7_data:
312                 break;
313         default:
314                 PKCS7err(PKCS7_F_PKCS7_DATAINIT,PKCS7_R_UNSUPPORTED_CONTENT_TYPE);
315                 goto err;
316                 }
317
318         for (i=0; i<sk_X509_ALGOR_num(md_sk); i++)
319                 if (!PKCS7_bio_add_digest(&out, sk_X509_ALGOR_value(md_sk, i)))
320                         goto err;
321
322         if (xa && !PKCS7_bio_add_digest(&out, xa))
323                         goto err;
324
325         if (evp_cipher != NULL)
326                 {
327                 unsigned char key[EVP_MAX_KEY_LENGTH];
328                 unsigned char iv[EVP_MAX_IV_LENGTH];
329                 int keylen,ivlen;
330                 EVP_CIPHER_CTX *ctx;
331
332                 if ((btmp=BIO_new(BIO_f_cipher())) == NULL)
333                         {
334                         PKCS7err(PKCS7_F_PKCS7_DATAINIT,ERR_R_BIO_LIB);
335                         goto err;
336                         }
337                 BIO_get_cipher_ctx(btmp, &ctx);
338                 keylen=EVP_CIPHER_key_length(evp_cipher);
339                 ivlen=EVP_CIPHER_iv_length(evp_cipher);
340                 xalg->algorithm = OBJ_nid2obj(EVP_CIPHER_type(evp_cipher));
341                 if (ivlen > 0)
342                         if (RAND_pseudo_bytes(iv,ivlen) <= 0)
343                                 goto err;
344                 if (EVP_CipherInit_ex(ctx, evp_cipher, NULL, NULL, NULL, 1)<=0)
345                         goto err;
346                 if (EVP_CIPHER_CTX_rand_key(ctx, key) <= 0)
347                         goto err;
348                 if (EVP_CipherInit_ex(ctx, NULL, NULL, key, iv, 1) <= 0)
349                         goto err;
350
351                 if (ivlen > 0) {
352                         if (xalg->parameter == NULL) {
353                                 xalg->parameter = ASN1_TYPE_new();
354                                 if (xalg->parameter == NULL)
355                                         goto err;
356                         }
357                         if(EVP_CIPHER_param_to_asn1(ctx, xalg->parameter) < 0)
358                                 goto err;
359                 }
360
361                 /* Lets do the pub key stuff :-) */
362                 for (i=0; i<sk_PKCS7_RECIP_INFO_num(rsk); i++)
363                         {
364                         ri=sk_PKCS7_RECIP_INFO_value(rsk,i);
365                         if (pkcs7_encode_rinfo(ri, key, keylen) <= 0)
366                                 goto err;
367                         }
368                 OPENSSL_cleanse(key, keylen);
369
370                 if (out == NULL)
371                         out=btmp;
372                 else
373                         BIO_push(out,btmp);
374                 btmp=NULL;
375                 }
376
377         if (bio == NULL)
378                 {
379                 if (PKCS7_is_detached(p7))
380                         bio=BIO_new(BIO_s_null());
381                 else if (os && os->length > 0)
382                         bio = BIO_new_mem_buf(os->data, os->length);
383                 if(bio == NULL)
384                         {
385                         bio=BIO_new(BIO_s_mem());
386                         if (bio == NULL)
387                                 goto err;
388                         BIO_set_mem_eof_return(bio,0);
389                         }
390                 }
391         if (out)
392                 BIO_push(out,bio);
393         else
394                 out = bio;
395         bio=NULL;
396         if (0)
397                 {
398 err:
399                 if (out != NULL)
400                         BIO_free_all(out);
401                 if (btmp != NULL)
402                         BIO_free_all(btmp);
403                 out=NULL;
404                 }
405         return(out);
406         }
407
408 static int pkcs7_cmp_ri(PKCS7_RECIP_INFO *ri, X509 *pcert)
409         {
410         int ret;
411         ret = X509_NAME_cmp(ri->issuer_and_serial->issuer,
412                                 pcert->cert_info->issuer);
413         if (ret)
414                 return ret;
415         return M_ASN1_INTEGER_cmp(pcert->cert_info->serialNumber,
416                                         ri->issuer_and_serial->serial);
417         }
418
419 /* int */
420 BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert)
421         {
422         int i,j;
423         BIO *out=NULL,*btmp=NULL,*etmp=NULL,*bio=NULL;
424         X509_ALGOR *xa;
425         ASN1_OCTET_STRING *data_body=NULL;
426         const EVP_MD *evp_md;
427         const EVP_CIPHER *evp_cipher=NULL;
428         EVP_CIPHER_CTX *evp_ctx=NULL;
429         X509_ALGOR *enc_alg=NULL;
430         STACK_OF(X509_ALGOR) *md_sk=NULL;
431         STACK_OF(PKCS7_RECIP_INFO) *rsk=NULL;
432         PKCS7_RECIP_INFO *ri=NULL;
433
434         i=OBJ_obj2nid(p7->type);
435         p7->state=PKCS7_S_HEADER;
436
437         switch (i)
438                 {
439         case NID_pkcs7_signed:
440                 data_body=PKCS7_get_octet_string(p7->d.sign->contents);
441                 md_sk=p7->d.sign->md_algs;
442                 break;
443         case NID_pkcs7_signedAndEnveloped:
444                 rsk=p7->d.signed_and_enveloped->recipientinfo;
445                 md_sk=p7->d.signed_and_enveloped->md_algs;
446                 data_body=p7->d.signed_and_enveloped->enc_data->enc_data;
447                 enc_alg=p7->d.signed_and_enveloped->enc_data->algorithm;
448                 evp_cipher=EVP_get_cipherbyobj(enc_alg->algorithm);
449                 if (evp_cipher == NULL)
450                         {
451                         PKCS7err(PKCS7_F_PKCS7_DATADECODE,PKCS7_R_UNSUPPORTED_CIPHER_TYPE);
452                         goto err;
453                         }
454                 break;
455         case NID_pkcs7_enveloped:
456                 rsk=p7->d.enveloped->recipientinfo;
457                 enc_alg=p7->d.enveloped->enc_data->algorithm;
458                 data_body=p7->d.enveloped->enc_data->enc_data;
459                 evp_cipher=EVP_get_cipherbyobj(enc_alg->algorithm);
460                 if (evp_cipher == NULL)
461                         {
462                         PKCS7err(PKCS7_F_PKCS7_DATADECODE,PKCS7_R_UNSUPPORTED_CIPHER_TYPE);
463                         goto err;
464                         }
465                 break;
466         default:
467                 PKCS7err(PKCS7_F_PKCS7_DATADECODE,PKCS7_R_UNSUPPORTED_CONTENT_TYPE);
468                 goto err;
469                 }
470
471         /* We will be checking the signature */
472         if (md_sk != NULL)
473                 {
474                 for (i=0; i<sk_X509_ALGOR_num(md_sk); i++)
475                         {
476                         xa=sk_X509_ALGOR_value(md_sk,i);
477                         if ((btmp=BIO_new(BIO_f_md())) == NULL)
478                                 {
479                                 PKCS7err(PKCS7_F_PKCS7_DATADECODE,ERR_R_BIO_LIB);
480                                 goto err;
481                                 }
482
483                         j=OBJ_obj2nid(xa->algorithm);
484                         evp_md=EVP_get_digestbynid(j);
485                         if (evp_md == NULL)
486                                 {
487                                 PKCS7err(PKCS7_F_PKCS7_DATADECODE,PKCS7_R_UNKNOWN_DIGEST_TYPE);
488                                 goto err;
489                                 }
490
491                         BIO_set_md(btmp,evp_md);
492                         if (out == NULL)
493                                 out=btmp;
494                         else
495                                 BIO_push(out,btmp);
496                         btmp=NULL;
497                         }
498                 }
499
500         if (evp_cipher != NULL)
501                 {
502 #if 0
503                 unsigned char key[EVP_MAX_KEY_LENGTH];
504                 unsigned char iv[EVP_MAX_IV_LENGTH];
505                 unsigned char *p;
506                 int keylen,ivlen;
507                 int max;
508                 X509_OBJECT ret;
509 #endif
510                 unsigned char *ek = NULL, *tkey = NULL;
511                 int eklen, tkeylen;
512
513                 if ((etmp=BIO_new(BIO_f_cipher())) == NULL)
514                         {
515                         PKCS7err(PKCS7_F_PKCS7_DATADECODE,ERR_R_BIO_LIB);
516                         goto err;
517                         }
518
519                 /* It was encrypted, we need to decrypt the secret key
520                  * with the private key */
521
522                 /* Find the recipientInfo which matches the passed certificate
523                  * (if any)
524                  */
525
526                 if (pcert)
527                         {
528                         for (i=0; i<sk_PKCS7_RECIP_INFO_num(rsk); i++)
529                                 {
530                                 ri=sk_PKCS7_RECIP_INFO_value(rsk,i);
531                                 if (!pkcs7_cmp_ri(ri, pcert))
532                                         break;
533                                 ri=NULL;
534                                 }
535                         if (ri == NULL)
536                                 {
537                                 PKCS7err(PKCS7_F_PKCS7_DATADECODE,
538                                       PKCS7_R_NO_RECIPIENT_MATCHES_CERTIFICATE);
539                                 goto err;
540                                 }
541                         }
542
543                 /* If we haven't got a certificate try each ri in turn */
544                 if (pcert == NULL)
545                         {
546                         /* Always attempt to decrypt all rinfo even
547                          * after sucess as a defence against MMA timing
548                          * attacks.
549                          */
550                         for (i=0; i<sk_PKCS7_RECIP_INFO_num(rsk); i++)
551                                 {
552                                 ri=sk_PKCS7_RECIP_INFO_value(rsk,i);
553                                 
554                                 if (pkcs7_decrypt_rinfo(&ek, &eklen,
555                                                         ri, pkey) < 0)
556                                         goto err;
557                                 ERR_clear_error();
558                                 }
559                         }
560                 else
561                         {
562                         /* Only exit on fatal errors, not decrypt failure */
563                         if (pkcs7_decrypt_rinfo(&ek, &eklen, ri, pkey) < 0)
564                                 goto err;
565                         ERR_clear_error();
566                         }
567
568                 evp_ctx=NULL;
569                 BIO_get_cipher_ctx(etmp,&evp_ctx);
570                 if (EVP_CipherInit_ex(evp_ctx,evp_cipher,NULL,NULL,NULL,0) <= 0)
571                         goto err;
572                 if (EVP_CIPHER_asn1_to_param(evp_ctx,enc_alg->parameter) < 0)
573                         goto err;
574                 /* Generate random key as MMA defence */
575                 tkeylen = EVP_CIPHER_CTX_key_length(evp_ctx);
576                 tkey = OPENSSL_malloc(tkeylen);
577                 if (!tkey)
578                         goto err;
579                 if (EVP_CIPHER_CTX_rand_key(evp_ctx, tkey) <= 0)
580                         goto err;
581                 if (ek == NULL)
582                         {
583                         ek = tkey;
584                         eklen = tkeylen;
585                         tkey = NULL;
586                         }
587
588                 if (eklen != EVP_CIPHER_CTX_key_length(evp_ctx)) {
589                         /* Some S/MIME clients don't use the same key
590                          * and effective key length. The key length is
591                          * determined by the size of the decrypted RSA key.
592                          */
593                         if(!EVP_CIPHER_CTX_set_key_length(evp_ctx, eklen))
594                                 {
595                                 /* Use random key as MMA defence */
596                                 OPENSSL_cleanse(ek, eklen);
597                                 OPENSSL_free(ek);
598                                 ek = tkey;
599                                 eklen = tkeylen;
600                                 tkey = NULL;
601                                 }
602                 } 
603                 /* Clear errors so we don't leak information useful in MMA */
604                 ERR_clear_error();
605                 if (EVP_CipherInit_ex(evp_ctx,NULL,NULL,ek,NULL,0) <= 0)
606                         goto err;
607
608                 if (ek)
609                         {
610                         OPENSSL_cleanse(ek,eklen);
611                         OPENSSL_free(ek);
612                         }
613                 if (tkey)
614                         {
615                         OPENSSL_cleanse(tkey,tkeylen);
616                         OPENSSL_free(tkey);
617                         }
618
619                 if (out == NULL)
620                         out=etmp;
621                 else
622                         BIO_push(out,etmp);
623                 etmp=NULL;
624                 }
625
626 #if 1
627         if (PKCS7_is_detached(p7) || (in_bio != NULL))
628                 {
629                 bio=in_bio;
630                 }
631         else 
632                 {
633 #if 0
634                 bio=BIO_new(BIO_s_mem());
635                 /* We need to set this so that when we have read all
636                  * the data, the encrypt BIO, if present, will read
637                  * EOF and encode the last few bytes */
638                 BIO_set_mem_eof_return(bio,0);
639
640                 if (data_body->length > 0)
641                         BIO_write(bio,(char *)data_body->data,data_body->length);
642 #else
643                 if (data_body->length > 0)
644                       bio = BIO_new_mem_buf(data_body->data,data_body->length);
645                 else {
646                         bio=BIO_new(BIO_s_mem());
647                         BIO_set_mem_eof_return(bio,0);
648                 }
649                 if (bio == NULL)
650                         goto err;
651 #endif
652                 }
653         BIO_push(out,bio);
654         bio=NULL;
655 #endif
656         if (0)
657                 {
658 err:
659                 if (out != NULL) BIO_free_all(out);
660                 if (btmp != NULL) BIO_free_all(btmp);
661                 if (etmp != NULL) BIO_free_all(etmp);
662                 if (bio != NULL) BIO_free_all(bio);
663                 out=NULL;
664                 }
665         return(out);
666         }
667
668 static BIO *PKCS7_find_digest(EVP_MD_CTX **pmd, BIO *bio, int nid)
669         {
670         for (;;)
671                 {
672                 bio=BIO_find_type(bio,BIO_TYPE_MD);
673                 if (bio == NULL)
674                         {
675                         PKCS7err(PKCS7_F_PKCS7_FIND_DIGEST,PKCS7_R_UNABLE_TO_FIND_MESSAGE_DIGEST);
676                         return NULL;    
677                         }
678                 BIO_get_md_ctx(bio,pmd);
679                 if (*pmd == NULL)
680                         {
681                         PKCS7err(PKCS7_F_PKCS7_FIND_DIGEST,ERR_R_INTERNAL_ERROR);
682                         return NULL;
683                         }       
684                 if (EVP_MD_CTX_type(*pmd) == nid)
685                         return bio;
686                 bio=BIO_next(bio);
687                 }
688         return NULL;
689         }
690
691 static int do_pkcs7_signed_attrib(PKCS7_SIGNER_INFO *si, EVP_MD_CTX *mctx)
692         {
693         unsigned char md_data[EVP_MAX_MD_SIZE];
694         unsigned int md_len;
695
696         /* Add signing time if not already present */
697         if (!PKCS7_get_signed_attribute(si, NID_pkcs9_signingTime))
698                 {
699                 if (!PKCS7_add0_attrib_signing_time(si, NULL))
700                         {
701                         PKCS7err(PKCS7_F_DO_PKCS7_SIGNED_ATTRIB,
702                                         ERR_R_MALLOC_FAILURE);
703                         return 0;
704                         }
705                 }
706
707         /* Add digest */
708         if (!EVP_DigestFinal_ex(mctx, md_data,&md_len))
709                 {
710                 PKCS7err(PKCS7_F_DO_PKCS7_SIGNED_ATTRIB, ERR_R_EVP_LIB);
711                 return 0;
712                 }
713         if (!PKCS7_add1_attrib_digest(si, md_data, md_len))
714                 {
715                 PKCS7err(PKCS7_F_DO_PKCS7_SIGNED_ATTRIB, ERR_R_MALLOC_FAILURE);
716                 return 0;
717                 }
718
719         /* Now sign the attributes */
720         if (!PKCS7_SIGNER_INFO_sign(si))
721                         return 0;
722
723         return 1;
724         }
725         
726                                 
727 int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
728         {
729         int ret=0;
730         int i,j;
731         BIO *btmp;
732         PKCS7_SIGNER_INFO *si;
733         EVP_MD_CTX *mdc,ctx_tmp;
734         STACK_OF(X509_ATTRIBUTE) *sk;
735         STACK_OF(PKCS7_SIGNER_INFO) *si_sk=NULL;
736         ASN1_OCTET_STRING *os=NULL;
737
738         EVP_MD_CTX_init(&ctx_tmp);
739         i=OBJ_obj2nid(p7->type);
740         p7->state=PKCS7_S_HEADER;
741
742         switch (i)
743                 {
744         case NID_pkcs7_data:
745                 os = p7->d.data;
746                 break;
747         case NID_pkcs7_signedAndEnveloped:
748                 /* XXXXXXXXXXXXXXXX */
749                 si_sk=p7->d.signed_and_enveloped->signer_info;
750                 os = p7->d.signed_and_enveloped->enc_data->enc_data;
751                 if (!os)
752                         {
753                         os=M_ASN1_OCTET_STRING_new();
754                         if (!os)
755                                 {
756                                 PKCS7err(PKCS7_F_PKCS7_DATAFINAL,ERR_R_MALLOC_FAILURE);
757                                 goto err;
758                                 }
759                         p7->d.signed_and_enveloped->enc_data->enc_data=os;
760                         }
761                 break;
762         case NID_pkcs7_enveloped:
763                 /* XXXXXXXXXXXXXXXX */
764                 os = p7->d.enveloped->enc_data->enc_data;
765                 if (!os)
766                         {
767                         os=M_ASN1_OCTET_STRING_new();
768                         if (!os)
769                                 {
770                                 PKCS7err(PKCS7_F_PKCS7_DATAFINAL,ERR_R_MALLOC_FAILURE);
771                                 goto err;
772                                 }
773                         p7->d.enveloped->enc_data->enc_data=os;
774                         }
775                 break;
776         case NID_pkcs7_signed:
777                 si_sk=p7->d.sign->signer_info;
778                 os=PKCS7_get_octet_string(p7->d.sign->contents);
779                 /* If detached data then the content is excluded */
780                 if(PKCS7_type_is_data(p7->d.sign->contents) && p7->detached) {
781                         M_ASN1_OCTET_STRING_free(os);
782                         p7->d.sign->contents->d.data = NULL;
783                 }
784                 break;
785
786         case NID_pkcs7_digest:
787                 os=PKCS7_get_octet_string(p7->d.digest->contents);
788                 /* If detached data then the content is excluded */
789                 if(PKCS7_type_is_data(p7->d.digest->contents) && p7->detached)
790                         {
791                         M_ASN1_OCTET_STRING_free(os);
792                         p7->d.digest->contents->d.data = NULL;
793                         }
794                 break;
795
796         default:
797                 PKCS7err(PKCS7_F_PKCS7_DATAFINAL,PKCS7_R_UNSUPPORTED_CONTENT_TYPE);
798                 goto err;
799                 }
800
801         if (si_sk != NULL)
802                 {
803                 for (i=0; i<sk_PKCS7_SIGNER_INFO_num(si_sk); i++)
804                         {
805                         si=sk_PKCS7_SIGNER_INFO_value(si_sk,i);
806                         if (si->pkey == NULL)
807                                 continue;
808
809                         j = OBJ_obj2nid(si->digest_alg->algorithm);
810
811                         btmp=bio;
812
813                         btmp = PKCS7_find_digest(&mdc, btmp, j);
814
815                         if (btmp == NULL)
816                                 goto err;
817
818                         /* We now have the EVP_MD_CTX, lets do the
819                          * signing. */
820                         if (!EVP_MD_CTX_copy_ex(&ctx_tmp,mdc))
821                                 goto err;
822
823                         sk=si->auth_attr;
824
825                         /* If there are attributes, we add the digest
826                          * attribute and only sign the attributes */
827                         if (sk_X509_ATTRIBUTE_num(sk) > 0)
828                                 {
829                                 if (!do_pkcs7_signed_attrib(si, &ctx_tmp))
830                                         goto err;
831                                 }
832                         else
833                                 {
834                                 unsigned char *abuf = NULL;
835                                 unsigned int abuflen;
836                                 abuflen = EVP_PKEY_size(si->pkey);
837                                 abuf = OPENSSL_malloc(abuflen);
838                                 if (!abuf)
839                                         goto err;
840
841                                 if (!EVP_SignFinal(&ctx_tmp, abuf, &abuflen,
842                                                         si->pkey))
843                                         {
844                                         PKCS7err(PKCS7_F_PKCS7_DATAFINAL,
845                                                         ERR_R_EVP_LIB);
846                                         goto err;
847                                         }
848                                 ASN1_STRING_set0(si->enc_digest, abuf, abuflen);
849                                 }
850                         }
851                 }
852         else if (i == NID_pkcs7_digest)
853                 {
854                 unsigned char md_data[EVP_MAX_MD_SIZE];
855                 unsigned int md_len;
856                 if (!PKCS7_find_digest(&mdc, bio,
857                                 OBJ_obj2nid(p7->d.digest->md->algorithm)))
858                         goto err;
859                 if (!EVP_DigestFinal_ex(mdc,md_data,&md_len))
860                         goto err;
861                 M_ASN1_OCTET_STRING_set(p7->d.digest->digest, md_data, md_len);
862                 }
863
864         if (!PKCS7_is_detached(p7) && !(os->flags & ASN1_STRING_FLAG_NDEF))
865                 {
866                 char *cont;
867                 long contlen;
868                 btmp=BIO_find_type(bio,BIO_TYPE_MEM);
869                 if (btmp == NULL)
870                         {
871                         PKCS7err(PKCS7_F_PKCS7_DATAFINAL,PKCS7_R_UNABLE_TO_FIND_MEM_BIO);
872                         goto err;
873                         }
874                 contlen = BIO_get_mem_data(btmp, &cont);
875                 /* Mark the BIO read only then we can use its copy of the data
876                  * instead of making an extra copy.
877                  */
878                 BIO_set_flags(btmp, BIO_FLAGS_MEM_RDONLY);
879                 BIO_set_mem_eof_return(btmp, 0);
880                 ASN1_STRING_set0(os, (unsigned char *)cont, contlen);
881                 }
882         ret=1;
883 err:
884         EVP_MD_CTX_cleanup(&ctx_tmp);
885         return(ret);
886         }
887
888 int PKCS7_SIGNER_INFO_sign(PKCS7_SIGNER_INFO *si)
889         {
890         EVP_MD_CTX mctx;
891         EVP_PKEY_CTX *pctx;
892         unsigned char *abuf = NULL;
893         int alen;
894         size_t siglen;
895         const EVP_MD *md = NULL;
896
897         md = EVP_get_digestbyobj(si->digest_alg->algorithm);
898         if (md == NULL)
899                 return 0;
900
901         EVP_MD_CTX_init(&mctx);
902         if (EVP_DigestSignInit(&mctx, &pctx, md,NULL, si->pkey) <= 0)
903                 goto err;
904
905         if (EVP_PKEY_CTX_ctrl(pctx, -1, EVP_PKEY_OP_SIGN,
906                                 EVP_PKEY_CTRL_PKCS7_SIGN, 0, si) <= 0)
907                 {
908                 PKCS7err(PKCS7_F_PKCS7_SIGNER_INFO_SIGN, PKCS7_R_CTRL_ERROR);
909                 goto err;
910                 }
911
912         alen = ASN1_item_i2d((ASN1_VALUE *)si->auth_attr,&abuf,
913                                 ASN1_ITEM_rptr(PKCS7_ATTR_SIGN));
914         if(!abuf)
915                 goto err;
916         if (EVP_DigestSignUpdate(&mctx,abuf,alen) <= 0)
917                 goto err;
918         OPENSSL_free(abuf);
919         if (EVP_DigestSignFinal(&mctx, NULL, &siglen) <= 0)
920                 goto err;
921         abuf = OPENSSL_malloc(siglen);
922         if(!abuf)
923                 goto err;
924         if (EVP_DigestSignFinal(&mctx, abuf, &siglen) <= 0)
925                 goto err;
926
927         if (EVP_PKEY_CTX_ctrl(pctx, -1, EVP_PKEY_OP_SIGN,
928                                 EVP_PKEY_CTRL_PKCS7_SIGN, 1, si) <= 0)
929                 {
930                 PKCS7err(PKCS7_F_PKCS7_SIGNER_INFO_SIGN, PKCS7_R_CTRL_ERROR);
931                 goto err;
932                 }
933
934         EVP_MD_CTX_cleanup(&mctx);
935
936         ASN1_STRING_set0(si->enc_digest, abuf, siglen);
937
938         return 1;
939
940         err:
941         if (abuf)
942                 OPENSSL_free(abuf);
943         EVP_MD_CTX_cleanup(&mctx);
944         return 0;
945
946         }
947
948 int PKCS7_dataVerify(X509_STORE *cert_store, X509_STORE_CTX *ctx, BIO *bio,
949              PKCS7 *p7, PKCS7_SIGNER_INFO *si)
950         {
951         PKCS7_ISSUER_AND_SERIAL *ias;
952         int ret=0,i;
953         STACK_OF(X509) *cert;
954         X509 *x509;
955
956         if (PKCS7_type_is_signed(p7))
957                 {
958                 cert=p7->d.sign->cert;
959                 }
960         else if (PKCS7_type_is_signedAndEnveloped(p7))
961                 {
962                 cert=p7->d.signed_and_enveloped->cert;
963                 }
964         else
965                 {
966                 PKCS7err(PKCS7_F_PKCS7_DATAVERIFY,PKCS7_R_WRONG_PKCS7_TYPE);
967                 goto err;
968                 }
969         /* XXXXXXXXXXXXXXXXXXXXXXX */
970         ias=si->issuer_and_serial;
971
972         x509=X509_find_by_issuer_and_serial(cert,ias->issuer,ias->serial);
973
974         /* were we able to find the cert in passed to us */
975         if (x509 == NULL)
976                 {
977                 PKCS7err(PKCS7_F_PKCS7_DATAVERIFY,PKCS7_R_UNABLE_TO_FIND_CERTIFICATE);
978                 goto err;
979                 }
980
981         /* Lets verify */
982         if(!X509_STORE_CTX_init(ctx,cert_store,x509,cert))
983                 {
984                 PKCS7err(PKCS7_F_PKCS7_DATAVERIFY,ERR_R_X509_LIB);
985                 goto err;
986                 }
987         X509_STORE_CTX_set_purpose(ctx, X509_PURPOSE_SMIME_SIGN);
988         i=X509_verify_cert(ctx);
989         if (i <= 0) 
990                 {
991                 PKCS7err(PKCS7_F_PKCS7_DATAVERIFY,ERR_R_X509_LIB);
992                 X509_STORE_CTX_cleanup(ctx);
993                 goto err;
994                 }
995         X509_STORE_CTX_cleanup(ctx);
996
997         return PKCS7_signatureVerify(bio, p7, si, x509);
998         err:
999         return ret;
1000         }
1001
1002 int PKCS7_signatureVerify(BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si,
1003                                                                 X509 *x509)
1004         {
1005         ASN1_OCTET_STRING *os;
1006         EVP_MD_CTX mdc_tmp,*mdc;
1007         int ret=0,i;
1008         int md_type;
1009         STACK_OF(X509_ATTRIBUTE) *sk;
1010         BIO *btmp;
1011         EVP_PKEY *pkey;
1012
1013         EVP_MD_CTX_init(&mdc_tmp);
1014
1015         if (!PKCS7_type_is_signed(p7) && 
1016                                 !PKCS7_type_is_signedAndEnveloped(p7)) {
1017                 PKCS7err(PKCS7_F_PKCS7_SIGNATUREVERIFY,
1018                                                 PKCS7_R_WRONG_PKCS7_TYPE);
1019                 goto err;
1020         }
1021
1022         md_type=OBJ_obj2nid(si->digest_alg->algorithm);
1023
1024         btmp=bio;
1025         for (;;)
1026                 {
1027                 if ((btmp == NULL) ||
1028                         ((btmp=BIO_find_type(btmp,BIO_TYPE_MD)) == NULL))
1029                         {
1030                         PKCS7err(PKCS7_F_PKCS7_SIGNATUREVERIFY,
1031                                         PKCS7_R_UNABLE_TO_FIND_MESSAGE_DIGEST);
1032                         goto err;
1033                         }
1034                 BIO_get_md_ctx(btmp,&mdc);
1035                 if (mdc == NULL)
1036                         {
1037                         PKCS7err(PKCS7_F_PKCS7_SIGNATUREVERIFY,
1038                                                         ERR_R_INTERNAL_ERROR);
1039                         goto err;
1040                         }
1041                 if (EVP_MD_CTX_type(mdc) == md_type)
1042                         break;
1043                 /* Workaround for some broken clients that put the signature
1044                  * OID instead of the digest OID in digest_alg->algorithm
1045                  */
1046                 if (EVP_MD_pkey_type(EVP_MD_CTX_md(mdc)) == md_type)
1047                         break;
1048                 btmp=BIO_next(btmp);
1049                 }
1050
1051         /* mdc is the digest ctx that we want, unless there are attributes,
1052          * in which case the digest is the signed attributes */
1053         if (!EVP_MD_CTX_copy_ex(&mdc_tmp,mdc))
1054                 goto err;
1055
1056         sk=si->auth_attr;
1057         if ((sk != NULL) && (sk_X509_ATTRIBUTE_num(sk) != 0))
1058                 {
1059                 unsigned char md_dat[EVP_MAX_MD_SIZE], *abuf = NULL;
1060                 unsigned int md_len;
1061                 int alen;
1062                 ASN1_OCTET_STRING *message_digest;
1063
1064                 if (!EVP_DigestFinal_ex(&mdc_tmp,md_dat,&md_len))
1065                         goto err;
1066                 message_digest=PKCS7_digest_from_attributes(sk);
1067                 if (!message_digest)
1068                         {
1069                         PKCS7err(PKCS7_F_PKCS7_SIGNATUREVERIFY,
1070                                         PKCS7_R_UNABLE_TO_FIND_MESSAGE_DIGEST);
1071                         goto err;
1072                         }
1073                 if ((message_digest->length != (int)md_len) ||
1074                         (memcmp(message_digest->data,md_dat,md_len)))
1075                         {
1076 #if 0
1077 {
1078 int ii;
1079 for (ii=0; ii<message_digest->length; ii++)
1080         printf("%02X",message_digest->data[ii]); printf(" sent\n");
1081 for (ii=0; ii<md_len; ii++) printf("%02X",md_dat[ii]); printf(" calc\n");
1082 }
1083 #endif
1084                         PKCS7err(PKCS7_F_PKCS7_SIGNATUREVERIFY,
1085                                                         PKCS7_R_DIGEST_FAILURE);
1086                         ret= -1;
1087                         goto err;
1088                         }
1089
1090                 if (!EVP_VerifyInit_ex(&mdc_tmp,EVP_get_digestbynid(md_type), NULL))
1091                         goto err;
1092
1093                 alen = ASN1_item_i2d((ASN1_VALUE *)sk, &abuf,
1094                                                 ASN1_ITEM_rptr(PKCS7_ATTR_VERIFY));
1095                 if (alen <= 0) 
1096                         {
1097                         PKCS7err(PKCS7_F_PKCS7_SIGNATUREVERIFY,ERR_R_ASN1_LIB);
1098                         ret = -1;
1099                         goto err;
1100                         }
1101                 if (!EVP_VerifyUpdate(&mdc_tmp, abuf, alen))
1102                         goto err;
1103
1104                 OPENSSL_free(abuf);
1105                 }
1106
1107         os=si->enc_digest;
1108         pkey = X509_get_pubkey(x509);
1109         if (!pkey)
1110                 {
1111                 ret = -1;
1112                 goto err;
1113                 }
1114
1115         i=EVP_VerifyFinal(&mdc_tmp,os->data,os->length, pkey);
1116         EVP_PKEY_free(pkey);
1117         if (i <= 0)
1118                 {
1119                 PKCS7err(PKCS7_F_PKCS7_SIGNATUREVERIFY,
1120                                                 PKCS7_R_SIGNATURE_FAILURE);
1121                 ret= -1;
1122                 goto err;
1123                 }
1124         else
1125                 ret=1;
1126 err:
1127         EVP_MD_CTX_cleanup(&mdc_tmp);
1128         return(ret);
1129         }
1130
1131 PKCS7_ISSUER_AND_SERIAL *PKCS7_get_issuer_and_serial(PKCS7 *p7, int idx)
1132         {
1133         STACK_OF(PKCS7_RECIP_INFO) *rsk;
1134         PKCS7_RECIP_INFO *ri;
1135         int i;
1136
1137         i=OBJ_obj2nid(p7->type);
1138         if (i != NID_pkcs7_signedAndEnveloped)
1139                 return NULL;
1140         if (p7->d.signed_and_enveloped == NULL)
1141                 return NULL;
1142         rsk=p7->d.signed_and_enveloped->recipientinfo;
1143         if (rsk == NULL)
1144                 return NULL;
1145         ri=sk_PKCS7_RECIP_INFO_value(rsk,0);
1146         if (sk_PKCS7_RECIP_INFO_num(rsk) <= idx) return(NULL);
1147         ri=sk_PKCS7_RECIP_INFO_value(rsk,idx);
1148         return(ri->issuer_and_serial);
1149         }
1150
1151 ASN1_TYPE *PKCS7_get_signed_attribute(PKCS7_SIGNER_INFO *si, int nid)
1152         {
1153         return(get_attribute(si->auth_attr,nid));
1154         }
1155
1156 ASN1_TYPE *PKCS7_get_attribute(PKCS7_SIGNER_INFO *si, int nid)
1157         {
1158         return(get_attribute(si->unauth_attr,nid));
1159         }
1160
1161 static ASN1_TYPE *get_attribute(STACK_OF(X509_ATTRIBUTE) *sk, int nid)
1162         {
1163         int i;
1164         X509_ATTRIBUTE *xa;
1165         ASN1_OBJECT *o;
1166
1167         o=OBJ_nid2obj(nid);
1168         if (!o || !sk) return(NULL);
1169         for (i=0; i<sk_X509_ATTRIBUTE_num(sk); i++)
1170                 {
1171                 xa=sk_X509_ATTRIBUTE_value(sk,i);
1172                 if (OBJ_cmp(xa->object,o) == 0)
1173                         {
1174                         if (!xa->single && sk_ASN1_TYPE_num(xa->value.set))
1175                                 return(sk_ASN1_TYPE_value(xa->value.set,0));
1176                         else
1177                                 return(NULL);
1178                         }
1179                 }
1180         return(NULL);
1181         }
1182
1183 ASN1_OCTET_STRING *PKCS7_digest_from_attributes(STACK_OF(X509_ATTRIBUTE) *sk)
1184 {
1185         ASN1_TYPE *astype;
1186         if(!(astype = get_attribute(sk, NID_pkcs9_messageDigest))) return NULL;
1187         return astype->value.octet_string;
1188 }
1189
1190 int PKCS7_set_signed_attributes(PKCS7_SIGNER_INFO *p7si,
1191                                 STACK_OF(X509_ATTRIBUTE) *sk)
1192         {
1193         int i;
1194
1195         if (p7si->auth_attr != NULL)
1196                 sk_X509_ATTRIBUTE_pop_free(p7si->auth_attr,X509_ATTRIBUTE_free);
1197         p7si->auth_attr=sk_X509_ATTRIBUTE_dup(sk);
1198         if (p7si->auth_attr == NULL)
1199                 return 0;
1200         for (i=0; i<sk_X509_ATTRIBUTE_num(sk); i++)
1201                 {
1202                 if ((sk_X509_ATTRIBUTE_set(p7si->auth_attr,i,
1203                         X509_ATTRIBUTE_dup(sk_X509_ATTRIBUTE_value(sk,i))))
1204                     == NULL)
1205                         return(0);
1206                 }
1207         return(1);
1208         }
1209
1210 int PKCS7_set_attributes(PKCS7_SIGNER_INFO *p7si, STACK_OF(X509_ATTRIBUTE) *sk)
1211         {
1212         int i;
1213
1214         if (p7si->unauth_attr != NULL)
1215                 sk_X509_ATTRIBUTE_pop_free(p7si->unauth_attr,
1216                                            X509_ATTRIBUTE_free);
1217         p7si->unauth_attr=sk_X509_ATTRIBUTE_dup(sk);
1218         if (p7si->unauth_attr == NULL)
1219                 return 0;
1220         for (i=0; i<sk_X509_ATTRIBUTE_num(sk); i++)
1221                 {
1222                 if ((sk_X509_ATTRIBUTE_set(p7si->unauth_attr,i,
1223                         X509_ATTRIBUTE_dup(sk_X509_ATTRIBUTE_value(sk,i))))
1224                     == NULL)
1225                         return(0);
1226                 }
1227         return(1);
1228         }
1229
1230 int PKCS7_add_signed_attribute(PKCS7_SIGNER_INFO *p7si, int nid, int atrtype,
1231              void *value)
1232         {
1233         return(add_attribute(&(p7si->auth_attr),nid,atrtype,value));
1234         }
1235
1236 int PKCS7_add_attribute(PKCS7_SIGNER_INFO *p7si, int nid, int atrtype,
1237              void *value)
1238         {
1239         return(add_attribute(&(p7si->unauth_attr),nid,atrtype,value));
1240         }
1241
1242 static int add_attribute(STACK_OF(X509_ATTRIBUTE) **sk, int nid, int atrtype,
1243                          void *value)
1244         {
1245         X509_ATTRIBUTE *attr=NULL;
1246
1247         if (*sk == NULL)
1248                 {
1249                 *sk = sk_X509_ATTRIBUTE_new_null();
1250                 if (*sk == NULL)
1251                         return 0;       
1252 new_attrib:
1253                 if (!(attr=X509_ATTRIBUTE_create(nid,atrtype,value)))
1254                         return 0;
1255                 if (!sk_X509_ATTRIBUTE_push(*sk,attr))
1256                         {
1257                         X509_ATTRIBUTE_free(attr);
1258                         return 0;
1259                         }
1260                 }
1261         else
1262                 {
1263                 int i;
1264
1265                 for (i=0; i<sk_X509_ATTRIBUTE_num(*sk); i++)
1266                         {
1267                         attr=sk_X509_ATTRIBUTE_value(*sk,i);
1268                         if (OBJ_obj2nid(attr->object) == nid)
1269                                 {
1270                                 X509_ATTRIBUTE_free(attr);
1271                                 attr=X509_ATTRIBUTE_create(nid,atrtype,value);
1272                                 if (attr == NULL)
1273                                         return 0;
1274                                 if (!sk_X509_ATTRIBUTE_set(*sk,i,attr))
1275                                         {
1276                                         X509_ATTRIBUTE_free(attr);
1277                                         return 0;
1278                                         }
1279                                 goto end;
1280                                 }
1281                         }
1282                 goto new_attrib;
1283                 }
1284 end:
1285         return(1);
1286         }
1287