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         int 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 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         int eklen;
 206
 207         int ret = 0;
 208
 209         pctx = EVP_PKEY_CTX_new(pkey, NULL);
 210         if (!pctx)
 211                 return 0;
 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                 PKCS7err(PKCS7_F_PKCS7_DECRYPT_RINFO, ERR_R_EVP_LIB);
 239                 goto err;
 240                 }
 241
 242         ret = 1;
 243
 244         *pek = ek;
 245         *peklen = eklen;
 246
 247         err:
 248         if (pctx)
 249                 EVP_PKEY_CTX_free(pctx);
 250         if (!ret && ek)
 251                 OPENSSL_free(ek);
 252
 253         return ret;
 254         }
 255
 256 BIO *PKCS7_dataInit(PKCS7 *p7, BIO *bio)
 257         {
 258         int i;
 259         BIO *out=NULL,*btmp=NULL;
 260         X509_ALGOR *xa = NULL;
 261         const EVP_CIPHER *evp_cipher=NULL;
 262         STACK_OF(X509_ALGOR) *md_sk=NULL;
 263         STACK_OF(PKCS7_RECIP_INFO) *rsk=NULL;
 264         X509_ALGOR *xalg=NULL;
 265         PKCS7_RECIP_INFO *ri=NULL;
 266         ASN1_OCTET_STRING *os=NULL;
 267
 268         i=OBJ_obj2nid(p7->type);
 269         p7->state=PKCS7_S_HEADER;
 270
 271         switch (i)
 272                 {
 273         case NID_pkcs7_signed:
 274                 md_sk=p7->d.sign->md_algs;
 275                 os = PKCS7_get_octet_string(p7->d.sign->contents);
 276                 break;
 277         case NID_pkcs7_signedAndEnveloped:
 278                 rsk=p7->d.signed_and_enveloped->recipientinfo;
 279                 md_sk=p7->d.signed_and_enveloped->md_algs;
 280                 xalg=p7->d.signed_and_enveloped->enc_data->algorithm;
 281                 evp_cipher=p7->d.signed_and_enveloped->enc_data->cipher;
 282                 if (evp_cipher == NULL)
 283                         {
 284                         PKCS7err(PKCS7_F_PKCS7_DATAINIT,
 285                                                 PKCS7_R_CIPHER_NOT_INITIALIZED);
 286                         goto err;
 287                         }
 288                 break;
 289         case NID_pkcs7_enveloped:
 290                 rsk=p7->d.enveloped->recipientinfo;
 291                 xalg=p7->d.enveloped->enc_data->algorithm;
 292                 evp_cipher=p7->d.enveloped->enc_data->cipher;
 293                 if (evp_cipher == NULL)
 294                         {
 295                         PKCS7err(PKCS7_F_PKCS7_DATAINIT,
 296                                                 PKCS7_R_CIPHER_NOT_INITIALIZED);
 297                         goto err;
 298                         }
 299                 break;
 300         case NID_pkcs7_digest:
 301                 xa = p7->d.digest->md;
 302                 os = PKCS7_get_octet_string(p7->d.digest->contents);
 303                 break;
 304         default:
 305                 PKCS7err(PKCS7_F_PKCS7_DATAINIT,PKCS7_R_UNSUPPORTED_CONTENT_TYPE);
 306                 goto err;
 307                 }
 308
 309         for (i=0; i<sk_X509_ALGOR_num(md_sk); i++)
 310                 if (!PKCS7_bio_add_digest(&out, sk_X509_ALGOR_value(md_sk, i)))
 311                         goto err;
 312
 313         if (xa && !PKCS7_bio_add_digest(&out, xa))
 314                         goto err;
 315
 316         if (evp_cipher != NULL)
 317                 {
 318                 unsigned char key[EVP_MAX_KEY_LENGTH];
 319                 unsigned char iv[EVP_MAX_IV_LENGTH];
 320                 int keylen,ivlen;
 321                 EVP_CIPHER_CTX *ctx;
 322
 323                 if ((btmp=BIO_new(BIO_f_cipher())) == NULL)
 324                         {
 325                         PKCS7err(PKCS7_F_PKCS7_DATAINIT,ERR_R_BIO_LIB);
 326                         goto err;
 327                         }
 328                 BIO_get_cipher_ctx(btmp, &ctx);
 329                 keylen=EVP_CIPHER_key_length(evp_cipher);
 330                 ivlen=EVP_CIPHER_iv_length(evp_cipher);
 331                 xalg->algorithm = OBJ_nid2obj(EVP_CIPHER_type(evp_cipher));
 332                 if (ivlen > 0) RAND_pseudo_bytes(iv,ivlen);
 333                 if (EVP_CipherInit_ex(ctx, evp_cipher, NULL, NULL, NULL, 1)<=0)
 334                         goto err;
 335                 if (EVP_CIPHER_CTX_rand_key(ctx, key) <= 0)
 336                         goto err;
 337                 if (EVP_CipherInit_ex(ctx, NULL, NULL, key, iv, 1) <= 0)
 338                         goto err;
 339
 340                 if (ivlen > 0) {
 341                         if (xalg->parameter == NULL)
 342                                                 xalg->parameter=ASN1_TYPE_new();
 343                         if(EVP_CIPHER_param_to_asn1(ctx, xalg->parameter) < 0)
 344                                                                        goto err;
 345                 }
 346
 347                 /* Lets do the pub key stuff :-) */
 348                 for (i=0; i<sk_PKCS7_RECIP_INFO_num(rsk); i++)
 349                         {
 350                         ri=sk_PKCS7_RECIP_INFO_value(rsk,i);
 351                         if (pkcs7_encode_rinfo(ri, key, keylen) <= 0)
 352                                 goto err;
 353                         }
 354                 OPENSSL_cleanse(key, keylen);
 355
 356                 if (out == NULL)
 357                         out=btmp;
 358                 else
 359                         BIO_push(out,btmp);
 360                 btmp=NULL;
 361                 }
 362
 363         if (bio == NULL)
 364                 {
 365                 if (PKCS7_is_detached(p7))
 366                         bio=BIO_new(BIO_s_null());
 367                 else if (os && os->length > 0)
 368                         bio = BIO_new_mem_buf(os->data, os->length);
 369                 if(bio == NULL)
 370                         {
 371                         bio=BIO_new(BIO_s_mem());
 372                         BIO_set_mem_eof_return(bio,0);
 373                         }
 374                 }
 375         BIO_push(out,bio);
 376         bio=NULL;
 377         if (0)
 378                 {
 379 err:
 380                 if (out != NULL)
 381                         BIO_free_all(out);
 382                 if (btmp != NULL)
 383                         BIO_free_all(btmp);
 384                 out=NULL;
 385                 }
 386         return(out);
 387         }
 388
 389 static int pkcs7_cmp_ri(PKCS7_RECIP_INFO *ri, X509 *pcert)
 390         {
 391         int ret;
 392         ret = X509_NAME_cmp(ri->issuer_and_serial->issuer,
 393                                 pcert->cert_info->issuer);
 394         if (ret)
 395                 return ret;
 396         return M_ASN1_INTEGER_cmp(pcert->cert_info->serialNumber,
 397                                         ri->issuer_and_serial->serial);
 398         }
 399
 400 /* int */
 401 BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert)
 402         {
 403         int i,j;
 404         BIO *out=NULL,*btmp=NULL,*etmp=NULL,*bio=NULL;
 405         X509_ALGOR *xa;
 406         ASN1_OCTET_STRING *data_body=NULL;
 407         const EVP_MD *evp_md;
 408         const EVP_CIPHER *evp_cipher=NULL;
 409         EVP_CIPHER_CTX *evp_ctx=NULL;
 410         X509_ALGOR *enc_alg=NULL;
 411         STACK_OF(X509_ALGOR) *md_sk=NULL;
 412         STACK_OF(PKCS7_RECIP_INFO) *rsk=NULL;
 413         X509_ALGOR *xalg=NULL;
 414         PKCS7_RECIP_INFO *ri=NULL;
 415
 416         i=OBJ_obj2nid(p7->type);
 417         p7->state=PKCS7_S_HEADER;
 418
 419         switch (i)
 420                 {
 421         case NID_pkcs7_signed:
 422                 data_body=PKCS7_get_octet_string(p7->d.sign->contents);
 423                 md_sk=p7->d.sign->md_algs;
 424                 break;
 425         case NID_pkcs7_signedAndEnveloped:
 426                 rsk=p7->d.signed_and_enveloped->recipientinfo;
 427                 md_sk=p7->d.signed_and_enveloped->md_algs;
 428                 data_body=p7->d.signed_and_enveloped->enc_data->enc_data;
 429                 enc_alg=p7->d.signed_and_enveloped->enc_data->algorithm;
 430                 evp_cipher=EVP_get_cipherbyobj(enc_alg->algorithm);
 431                 if (evp_cipher == NULL)
 432                         {
 433                         PKCS7err(PKCS7_F_PKCS7_DATADECODE,PKCS7_R_UNSUPPORTED_CIPHER_TYPE);
 434                         goto err;
 435                         }
 436                 xalg=p7->d.signed_and_enveloped->enc_data->algorithm;
 437                 break;
 438         case NID_pkcs7_enveloped:
 439                 rsk=p7->d.enveloped->recipientinfo;
 440                 enc_alg=p7->d.enveloped->enc_data->algorithm;
 441                 data_body=p7->d.enveloped->enc_data->enc_data;
 442                 evp_cipher=EVP_get_cipherbyobj(enc_alg->algorithm);
 443                 if (evp_cipher == NULL)
 444                         {
 445                         PKCS7err(PKCS7_F_PKCS7_DATADECODE,PKCS7_R_UNSUPPORTED_CIPHER_TYPE);
 446                         goto err;
 447                         }
 448                 xalg=p7->d.enveloped->enc_data->algorithm;
 449                 break;
 450         default:
 451                 PKCS7err(PKCS7_F_PKCS7_DATADECODE,PKCS7_R_UNSUPPORTED_CONTENT_TYPE);
 452                 goto err;
 453                 }
 454
 455         /* We will be checking the signature */
 456         if (md_sk != NULL)
 457                 {
 458                 for (i=0; i<sk_X509_ALGOR_num(md_sk); i++)
 459                         {
 460                         xa=sk_X509_ALGOR_value(md_sk,i);
 461                         if ((btmp=BIO_new(BIO_f_md())) == NULL)
 462                                 {
 463                                 PKCS7err(PKCS7_F_PKCS7_DATADECODE,ERR_R_BIO_LIB);
 464                                 goto err;
 465                                 }
 466
 467                         j=OBJ_obj2nid(xa->algorithm);
 468                         evp_md=EVP_get_digestbynid(j);
 469                         if (evp_md == NULL)
 470                                 {
 471                                 PKCS7err(PKCS7_F_PKCS7_DATADECODE,PKCS7_R_UNKNOWN_DIGEST_TYPE);
 472                                 goto err;
 473                                 }
 474
 475                         BIO_set_md(btmp,evp_md);
 476                         if (out == NULL)
 477                                 out=btmp;
 478                         else
 479                                 BIO_push(out,btmp);
 480                         btmp=NULL;
 481                         }
 482                 }
 483
 484         if (evp_cipher != NULL)
 485                 {
 486 #if 0
 487                 unsigned char key[EVP_MAX_KEY_LENGTH];
 488                 unsigned char iv[EVP_MAX_IV_LENGTH];
 489                 unsigned char *p;
 490                 int keylen,ivlen;
 491                 int max;
 492                 X509_OBJECT ret;
 493 #endif
 494                 unsigned char *ek = NULL;
 495                 int eklen;
 496
 497                 if ((etmp=BIO_new(BIO_f_cipher())) == NULL)
 498                         {
 499                         PKCS7err(PKCS7_F_PKCS7_DATADECODE,ERR_R_BIO_LIB);
 500                         goto err;
 501                         }
 502
 503                 /* It was encrypted, we need to decrypt the secret key
 504                  * with the private key */
 505
 506                 /* Find the recipientInfo which matches the passed certificate
 507                  * (if any)
 508                  */
 509
 510                 if (pcert)
 511                         {
 512                         for (i=0; i<sk_PKCS7_RECIP_INFO_num(rsk); i++)
 513                                 {
 514                                 ri=sk_PKCS7_RECIP_INFO_value(rsk,i);
 515                                 if (!pkcs7_cmp_ri(ri, pcert))
 516                                         break;
 517                                 ri=NULL;
 518                                 }
 519                         if (ri == NULL)
 520                                 {
 521                                 PKCS7err(PKCS7_F_PKCS7_DATADECODE,
 522                                       PKCS7_R_NO_RECIPIENT_MATCHES_CERTIFICATE);
 523                                 goto err;
 524                                 }
 525                         }
 526
 527                 /* If we haven't got a certificate try each ri in turn */
 528
 529                 if (pcert == NULL)
 530                         {
 531                         for (i=0; i<sk_PKCS7_RECIP_INFO_num(rsk); i++)
 532                                 {
 533                                 ri=sk_PKCS7_RECIP_INFO_value(rsk,i);
 534                                 if (pkcs7_decrypt_rinfo(&ek, &eklen,
 535                                                         ri, pkey) > 0)
 536                                         break;
 537                                 ERR_clear_error();
 538                                 ri = NULL;
 539                                 }
 540                         if (ri == NULL)
 541                                 {
 542                                 PKCS7err(PKCS7_F_PKCS7_DATADECODE,
 543                                       PKCS7_R_NO_RECIPIENT_MATCHES_KEY);
 544                                 goto err;
 545                                 }
 546                         }
 547                 else
 548                         {
 549                         if (pkcs7_decrypt_rinfo(&ek, &eklen, ri, pkey) <= 0)
 550                                 goto err;
 551                         }
 552
 553                 evp_ctx=NULL;
 554                 BIO_get_cipher_ctx(etmp,&evp_ctx);
 555                 if (EVP_CipherInit_ex(evp_ctx,evp_cipher,NULL,NULL,NULL,0) <= 0)
 556                         goto err;
 557                 if (EVP_CIPHER_asn1_to_param(evp_ctx,enc_alg->parameter) < 0)
 558                         goto err;
 559
 560                 if (eklen != EVP_CIPHER_CTX_key_length(evp_ctx)) {
 561                         /* Some S/MIME clients don't use the same key
 562                          * and effective key length. The key length is
 563                          * determined by the size of the decrypted RSA key.
 564                          */
 565                         if(!EVP_CIPHER_CTX_set_key_length(evp_ctx, eklen))
 566                                 {
 567                                 PKCS7err(PKCS7_F_PKCS7_DATADECODE,
 568                                         PKCS7_R_DECRYPTED_KEY_IS_WRONG_LENGTH);
 569                                 goto err;
 570                                 }
 571                 }
 572                 if (EVP_CipherInit_ex(evp_ctx,NULL,NULL,ek,NULL,0) <= 0)
 573                         goto err;
 574
 575                 if (ek)
 576                         {
 577                         OPENSSL_cleanse(ek,eklen);
 578                         OPENSSL_free(ek);
 579                         }
 580
 581                 if (out == NULL)
 582                         out=etmp;
 583                 else
 584                         BIO_push(out,etmp);
 585                 etmp=NULL;
 586                 }
 587
 588 #if 1
 589         if (PKCS7_is_detached(p7) || (in_bio != NULL))
 590                 {
 591                 bio=in_bio;
 592                 }
 593         else
 594                 {
 595 #if 0
 596                 bio=BIO_new(BIO_s_mem());
 597                 /* We need to set this so that when we have read all
 598                  * the data, the encrypt BIO, if present, will read
 599                  * EOF and encode the last few bytes */
 600                 BIO_set_mem_eof_return(bio,0);
 601
 602                 if (data_body->length > 0)
 603                         BIO_write(bio,(char *)data_body->data,data_body->length);
 604 #else
 605                 if (data_body->length > 0)
 606                       bio = BIO_new_mem_buf(data_body->data,data_body->length);
 607                 else {
 608                         bio=BIO_new(BIO_s_mem());
 609                         BIO_set_mem_eof_return(bio,0);
 610                 }
 611 #endif
 612                 }
 613         BIO_push(out,bio);
 614         bio=NULL;
 615 #endif
 616         if (0)
 617                 {
 618 err:
 619                 if (out != NULL) BIO_free_all(out);
 620                 if (btmp != NULL) BIO_free_all(btmp);
 621                 if (etmp != NULL) BIO_free_all(etmp);
 622                 if (bio != NULL) BIO_free_all(bio);
 623                 out=NULL;
 624                 }
 625         return(out);
 626         }
 627
 628 static BIO *PKCS7_find_digest(EVP_MD_CTX **pmd, BIO *bio, int nid)
 629         {
 630         for (;;)
 631                 {
 632                 bio=BIO_find_type(bio,BIO_TYPE_MD);
 633                 if (bio == NULL)
 634                         {
 635                         PKCS7err(PKCS7_F_PKCS7_FIND_DIGEST,PKCS7_R_UNABLE_TO_FIND_MESSAGE_DIGEST);
 636                         return NULL;
 637                         }
 638                 BIO_get_md_ctx(bio,pmd);
 639                 if (*pmd == NULL)
 640                         {
 641                         PKCS7err(PKCS7_F_PKCS7_FIND_DIGEST,ERR_R_INTERNAL_ERROR);
 642                         return NULL;
 643                         }
 644                 if (EVP_MD_CTX_type(*pmd) == nid)
 645                         return bio;
 646                 bio=BIO_next(bio);
 647                 }
 648         return NULL;
 649         }
 650
 651 int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
 652         {
 653         int ret=0;
 654         int i,j;
 655         BIO *btmp;
 656         BUF_MEM *buf_mem=NULL;
 657         BUF_MEM *buf=NULL;
 658         PKCS7_SIGNER_INFO *si;
 659         EVP_MD_CTX *mdc,ctx_tmp;
 660         STACK_OF(X509_ATTRIBUTE) *sk;
 661         STACK_OF(PKCS7_SIGNER_INFO) *si_sk=NULL;
 662         ASN1_OCTET_STRING *os=NULL;
 663
 664         EVP_MD_CTX_init(&ctx_tmp);
 665         i=OBJ_obj2nid(p7->type);
 666         p7->state=PKCS7_S_HEADER;
 667
 668         switch (i)
 669                 {
 670         case NID_pkcs7_signedAndEnveloped:
 671                 /* XXXXXXXXXXXXXXXX */
 672                 si_sk=p7->d.signed_and_enveloped->signer_info;
 673                 if (!(os=M_ASN1_OCTET_STRING_new()))
 674                         {
 675                         PKCS7err(PKCS7_F_PKCS7_DATAFINAL,ERR_R_MALLOC_FAILURE);
 676                         goto err;
 677                         }
 678                 p7->d.signed_and_enveloped->enc_data->enc_data=os;
 679                 break;
 680         case NID_pkcs7_enveloped:
 681                 /* XXXXXXXXXXXXXXXX */
 682                 if (!(os=M_ASN1_OCTET_STRING_new()))
 683                         {
 684                         PKCS7err(PKCS7_F_PKCS7_DATAFINAL,ERR_R_MALLOC_FAILURE);
 685                         goto err;
 686                         }
 687                 p7->d.enveloped->enc_data->enc_data=os;
 688                 break;
 689         case NID_pkcs7_signed:
 690                 si_sk=p7->d.sign->signer_info;
 691                 os=PKCS7_get_octet_string(p7->d.sign->contents);
 692                 /* If detached data then the content is excluded */
 693                 if(PKCS7_type_is_data(p7->d.sign->contents) && p7->detached) {
 694                         M_ASN1_OCTET_STRING_free(os);
 695                         p7->d.sign->contents->d.data = NULL;
 696                 }
 697                 break;
 698
 699         case NID_pkcs7_digest:
 700                 os=PKCS7_get_octet_string(p7->d.digest->contents);
 701                 /* If detached data then the content is excluded */
 702                 if(PKCS7_type_is_data(p7->d.digest->contents) && p7->detached)
 703                         {
 704                         M_ASN1_OCTET_STRING_free(os);
 705                         p7->d.digest->contents->d.data = NULL;
 706                         }
 707                 break;
 708
 709                 }
 710
 711         if (si_sk != NULL)
 712                 {
 713                 if ((buf=BUF_MEM_new()) == NULL)
 714                         {
 715                         PKCS7err(PKCS7_F_PKCS7_DATAFINAL,ERR_R_BIO_LIB);
 716                         goto err;
 717                         }
 718                 for (i=0; i<sk_PKCS7_SIGNER_INFO_num(si_sk); i++)
 719                         {
 720                         si=sk_PKCS7_SIGNER_INFO_value(si_sk,i);
 721                         if (si->pkey == NULL) continue;
 722
 723                         j=OBJ_obj2nid(si->digest_alg->algorithm);
 724
 725                         btmp=bio;
 726
 727                         btmp = PKCS7_find_digest(&mdc, btmp, j);
 728
 729                         if (btmp == NULL)
 730                                 goto err;
 731
 732                         /* We now have the EVP_MD_CTX, lets do the
 733                          * signing. */
 734                         EVP_MD_CTX_copy_ex(&ctx_tmp,mdc);
 735                         if (!BUF_MEM_grow_clean(buf,EVP_PKEY_size(si->pkey)))
 736                                 {
 737                                 PKCS7err(PKCS7_F_PKCS7_DATAFINAL,ERR_R_BIO_LIB);
 738                                 goto err;
 739                                 }
 740
 741                         sk=si->auth_attr;
 742
 743                         /* If there are attributes, we add the digest
 744                          * attribute and only sign the attributes */
 745                         if ((sk != NULL) && (sk_X509_ATTRIBUTE_num(sk) != 0))
 746                                 {
 747                                 unsigned char md_data[EVP_MAX_MD_SIZE], *abuf=NULL;
 748                                 unsigned int md_len, alen;
 749                                 ASN1_OCTET_STRING *digest;
 750                                 ASN1_UTCTIME *sign_time;
 751                                 const EVP_MD *md_tmp;
 752
 753                                 /* Add signing time if not already present */
 754                                 if (!PKCS7_get_signed_attribute(si,
 755                                                         NID_pkcs9_signingTime))
 756                                         {
 757                                         if (!(sign_time=X509_gmtime_adj(NULL,0)))
 758                                                 {
 759                                                 PKCS7err(PKCS7_F_PKCS7_DATAFINAL,
 760                                                         ERR_R_MALLOC_FAILURE);
 761                                                 goto err;
 762                                                 }
 763                                         PKCS7_add_signed_attribute(si,
 764                                                 NID_pkcs9_signingTime,
 765                                                 V_ASN1_UTCTIME,sign_time);
 766                                         }
 767
 768                                 /* Add digest */
 769                                 md_tmp=EVP_MD_CTX_md(&ctx_tmp);
 770                                 EVP_DigestFinal_ex(&ctx_tmp,md_data,&md_len);
 771                                 if (!(digest=M_ASN1_OCTET_STRING_new()))
 772                                         {
 773                                         PKCS7err(PKCS7_F_PKCS7_DATAFINAL,
 774                                                 ERR_R_MALLOC_FAILURE);
 775                                         goto err;
 776                                         }
 777                                 if (!M_ASN1_OCTET_STRING_set(digest,md_data,
 778                                                                 md_len))
 779                                         {
 780                                         PKCS7err(PKCS7_F_PKCS7_DATAFINAL,
 781                                                 ERR_R_MALLOC_FAILURE);
 782                                         goto err;
 783                                         }
 784                                 PKCS7_add_signed_attribute(si,
 785                                         NID_pkcs9_messageDigest,
 786                                         V_ASN1_OCTET_STRING,digest);
 787
 788                                 /* Now sign the attributes */
 789                                 EVP_SignInit_ex(&ctx_tmp,md_tmp,NULL);
 790                                 alen = ASN1_item_i2d((ASN1_VALUE *)sk,&abuf,
 791                                                         ASN1_ITEM_rptr(PKCS7_ATTR_SIGN));
 792                                 if(!abuf) goto err;
 793                                 EVP_SignUpdate(&ctx_tmp,abuf,alen);
 794                                 OPENSSL_free(abuf);
 795                                 }
 796
 797                         if (!EVP_SignFinal(&ctx_tmp,(unsigned char *)buf->data,
 798                                 (unsigned int *)&buf->length,si->pkey))
 799                                 {
 800                                 PKCS7err(PKCS7_F_PKCS7_DATAFINAL,ERR_R_EVP_LIB);
 801                                 goto err;
 802                                 }
 803                         if (!ASN1_STRING_set(si->enc_digest,
 804                                 (unsigned char *)buf->data,buf->length))
 805                                 {
 806                                 PKCS7err(PKCS7_F_PKCS7_DATAFINAL,ERR_R_ASN1_LIB);
 807                                 goto err;
 808                                 }
 809                         }
 810                 }
 811         else if (i == NID_pkcs7_digest)
 812                 {
 813                 unsigned char md_data[EVP_MAX_MD_SIZE];
 814                 unsigned int md_len;
 815                 if (!PKCS7_find_digest(&mdc, bio,
 816                                 OBJ_obj2nid(p7->d.digest->md->algorithm)))
 817                         goto err;
 818                 EVP_DigestFinal_ex(mdc,md_data,&md_len);
 819                 M_ASN1_OCTET_STRING_set(p7->d.digest->digest, md_data, md_len);
 820                 }
 821
 822         if (!PKCS7_is_detached(p7))
 823                 {
 824                 btmp=BIO_find_type(bio,BIO_TYPE_MEM);
 825                 if (btmp == NULL)
 826                         {
 827                         PKCS7err(PKCS7_F_PKCS7_DATAFINAL,PKCS7_R_UNABLE_TO_FIND_MEM_BIO);
 828                         goto err;
 829                         }
 830                 BIO_get_mem_ptr(btmp,&buf_mem);
 831                 /* Mark the BIO read only then we can use its copy of the data
 832                  * instead of making an extra copy.
 833                  */
 834                 BIO_set_flags(btmp, BIO_FLAGS_MEM_RDONLY);
 835                 BIO_set_mem_eof_return(btmp, 0);
 836                 os->data = (unsigned char *)buf_mem->data;
 837                 os->length = buf_mem->length;
 838 #if 0
 839                 M_ASN1_OCTET_STRING_set(os,
 840                         (unsigned char *)buf_mem->data,buf_mem->length);
 841 #endif
 842                 }
 843         ret=1;
 844 err:
 845         EVP_MD_CTX_cleanup(&ctx_tmp);
 846         if (buf != NULL) BUF_MEM_free(buf);
 847         return(ret);
 848         }
 849
 850 int PKCS7_dataVerify(X509_STORE *cert_store, X509_STORE_CTX *ctx, BIO *bio,
 851              PKCS7 *p7, PKCS7_SIGNER_INFO *si)
 852         {
 853         PKCS7_ISSUER_AND_SERIAL *ias;
 854         int ret=0,i;
 855         STACK_OF(X509) *cert;
 856         X509 *x509;
 857
 858         if (PKCS7_type_is_signed(p7))
 859                 {
 860                 cert=p7->d.sign->cert;
 861                 }
 862         else if (PKCS7_type_is_signedAndEnveloped(p7))
 863                 {
 864                 cert=p7->d.signed_and_enveloped->cert;
 865                 }
 866         else
 867                 {
 868                 PKCS7err(PKCS7_F_PKCS7_DATAVERIFY,PKCS7_R_WRONG_PKCS7_TYPE);
 869                 goto err;
 870                 }
 871         /* XXXXXXXXXXXXXXXXXXXXXXX */
 872         ias=si->issuer_and_serial;
 873
 874         x509=X509_find_by_issuer_and_serial(cert,ias->issuer,ias->serial);
 875
 876         /* were we able to find the cert in passed to us */
 877         if (x509 == NULL)
 878                 {
 879                 PKCS7err(PKCS7_F_PKCS7_DATAVERIFY,PKCS7_R_UNABLE_TO_FIND_CERTIFICATE);
 880                 goto err;
 881                 }
 882
 883         /* Lets verify */
 884         if(!X509_STORE_CTX_init(ctx,cert_store,x509,cert))
 885                 {
 886                 PKCS7err(PKCS7_F_PKCS7_DATAVERIFY,ERR_R_X509_LIB);
 887                 goto err;
 888                 }
 889         X509_STORE_CTX_set_purpose(ctx, X509_PURPOSE_SMIME_SIGN);
 890         i=X509_verify_cert(ctx);
 891         if (i <= 0)
 892                 {
 893                 PKCS7err(PKCS7_F_PKCS7_DATAVERIFY,ERR_R_X509_LIB);
 894                 X509_STORE_CTX_cleanup(ctx);
 895                 goto err;
 896                 }
 897         X509_STORE_CTX_cleanup(ctx);
 898
 899         return PKCS7_signatureVerify(bio, p7, si, x509);
 900         err:
 901         return ret;
 902         }
 903
 904 int PKCS7_signatureVerify(BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si,
 905                                                                 X509 *x509)
 906         {
 907         ASN1_OCTET_STRING *os;
 908         EVP_MD_CTX mdc_tmp,*mdc;
 909         int ret=0,i;
 910         int md_type;
 911         STACK_OF(X509_ATTRIBUTE) *sk;
 912         BIO *btmp;
 913         EVP_PKEY *pkey;
 914
 915         EVP_MD_CTX_init(&mdc_tmp);
 916
 917         if (!PKCS7_type_is_signed(p7) &&
 918                                 !PKCS7_type_is_signedAndEnveloped(p7)) {
 919                 PKCS7err(PKCS7_F_PKCS7_SIGNATUREVERIFY,
 920                                                 PKCS7_R_WRONG_PKCS7_TYPE);
 921                 goto err;
 922         }
 923
 924         md_type=OBJ_obj2nid(si->digest_alg->algorithm);
 925
 926         btmp=bio;
 927         for (;;)
 928                 {
 929                 if ((btmp == NULL) ||
 930                         ((btmp=BIO_find_type(btmp,BIO_TYPE_MD)) == NULL))
 931                         {
 932                         PKCS7err(PKCS7_F_PKCS7_SIGNATUREVERIFY,
 933                                         PKCS7_R_UNABLE_TO_FIND_MESSAGE_DIGEST);
 934                         goto err;
 935                         }
 936                 BIO_get_md_ctx(btmp,&mdc);
 937                 if (mdc == NULL)
 938                         {
 939                         PKCS7err(PKCS7_F_PKCS7_SIGNATUREVERIFY,
 940                                                         ERR_R_INTERNAL_ERROR);
 941                         goto err;
 942                         }
 943                 if (EVP_MD_CTX_type(mdc) == md_type)
 944                         break;
 945                 /* Workaround for some broken clients that put the signature
 946                  * OID instead of the digest OID in digest_alg->algorithm
 947                  */
 948                 if (EVP_MD_pkey_type(EVP_MD_CTX_md(mdc)) == md_type)
 949                         break;
 950                 btmp=BIO_next(btmp);
 951                 }
 952
 953         /* mdc is the digest ctx that we want, unless there are attributes,
 954          * in which case the digest is the signed attributes */
 955         EVP_MD_CTX_copy_ex(&mdc_tmp,mdc);
 956
 957         sk=si->auth_attr;
 958         if ((sk != NULL) && (sk_X509_ATTRIBUTE_num(sk) != 0))
 959                 {
 960                 unsigned char md_dat[EVP_MAX_MD_SIZE], *abuf = NULL;
 961                 unsigned int md_len, alen;
 962                 ASN1_OCTET_STRING *message_digest;
 963
 964                 EVP_DigestFinal_ex(&mdc_tmp,md_dat,&md_len);
 965                 message_digest=PKCS7_digest_from_attributes(sk);
 966                 if (!message_digest)
 967                         {
 968                         PKCS7err(PKCS7_F_PKCS7_SIGNATUREVERIFY,
 969                                         PKCS7_R_UNABLE_TO_FIND_MESSAGE_DIGEST);
 970                         goto err;
 971                         }
 972                 if ((message_digest->length != (int)md_len) ||
 973                         (memcmp(message_digest->data,md_dat,md_len)))
 974                         {
 975 #if 0
 976 {
 977 int ii;
 978 for (ii=0; ii<message_digest->length; ii++)
 979         printf("%02X",message_digest->data[ii]); printf(" sent\n");
 980 for (ii=0; ii<md_len; ii++) printf("%02X",md_dat[ii]); printf(" calc\n");
 981 }
 982 #endif
 983                         PKCS7err(PKCS7_F_PKCS7_SIGNATUREVERIFY,
 984                                                         PKCS7_R_DIGEST_FAILURE);
 985                         ret= -1;
 986                         goto err;
 987                         }
 988
 989                 EVP_VerifyInit_ex(&mdc_tmp,EVP_get_digestbynid(md_type), NULL);
 990
 991                 alen = ASN1_item_i2d((ASN1_VALUE *)sk, &abuf,
 992                                                 ASN1_ITEM_rptr(PKCS7_ATTR_VERIFY));
 993                 EVP_VerifyUpdate(&mdc_tmp, abuf, alen);
 994
 995                 OPENSSL_free(abuf);
 996                 }
 997
 998         os=si->enc_digest;
 999         pkey = X509_get_pubkey(x509);
1000         if (!pkey)
1001                 {
1002                 ret = -1;
1003                 goto err;
1004                 }
1005
1006         i=EVP_VerifyFinal(&mdc_tmp,os->data,os->length, pkey);
1007         EVP_PKEY_free(pkey);
1008         if (i <= 0)
1009                 {
1010                 PKCS7err(PKCS7_F_PKCS7_SIGNATUREVERIFY,
1011                                                 PKCS7_R_SIGNATURE_FAILURE);
1012                 ret= -1;
1013                 goto err;
1014                 }
1015         else
1016                 ret=1;
1017 err:
1018         EVP_MD_CTX_cleanup(&mdc_tmp);
1019         return(ret);
1020         }
1021
1022 PKCS7_ISSUER_AND_SERIAL *PKCS7_get_issuer_and_serial(PKCS7 *p7, int idx)
1023         {
1024         STACK_OF(PKCS7_RECIP_INFO) *rsk;
1025         PKCS7_RECIP_INFO *ri;
1026         int i;
1027
1028         i=OBJ_obj2nid(p7->type);
1029         if (i != NID_pkcs7_signedAndEnveloped) return(NULL);
1030         rsk=p7->d.signed_and_enveloped->recipientinfo;
1031         ri=sk_PKCS7_RECIP_INFO_value(rsk,0);
1032         if (sk_PKCS7_RECIP_INFO_num(rsk) <= idx) return(NULL);
1033         ri=sk_PKCS7_RECIP_INFO_value(rsk,idx);
1034         return(ri->issuer_and_serial);
1035         }
1036
1037 ASN1_TYPE *PKCS7_get_signed_attribute(PKCS7_SIGNER_INFO *si, int nid)
1038         {
1039         return(get_attribute(si->auth_attr,nid));
1040         }
1041
1042 ASN1_TYPE *PKCS7_get_attribute(PKCS7_SIGNER_INFO *si, int nid)
1043         {
1044         return(get_attribute(si->unauth_attr,nid));
1045         }
1046
1047 static ASN1_TYPE *get_attribute(STACK_OF(X509_ATTRIBUTE) *sk, int nid)
1048         {
1049         int i;
1050         X509_ATTRIBUTE *xa;
1051         ASN1_OBJECT *o;
1052
1053         o=OBJ_nid2obj(nid);
1054         if (!o || !sk) return(NULL);
1055         for (i=0; i<sk_X509_ATTRIBUTE_num(sk); i++)
1056                 {
1057                 xa=sk_X509_ATTRIBUTE_value(sk,i);
1058                 if (OBJ_cmp(xa->object,o) == 0)
1059                         {
1060                         if (!xa->single && sk_ASN1_TYPE_num(xa->value.set))
1061                                 return(sk_ASN1_TYPE_value(xa->value.set,0));
1062                         else
1063                                 return(NULL);
1064                         }
1065                 }
1066         return(NULL);
1067         }
1068
1069 ASN1_OCTET_STRING *PKCS7_digest_from_attributes(STACK_OF(X509_ATTRIBUTE) *sk)
1070 {
1071         ASN1_TYPE *astype;
1072         if(!(astype = get_attribute(sk, NID_pkcs9_messageDigest))) return NULL;
1073         return astype->value.octet_string;
1074 }
1075
1076 int PKCS7_set_signed_attributes(PKCS7_SIGNER_INFO *p7si,
1077                                 STACK_OF(X509_ATTRIBUTE) *sk)
1078         {
1079         int i;
1080
1081         if (p7si->auth_attr != NULL)
1082                 sk_X509_ATTRIBUTE_pop_free(p7si->auth_attr,X509_ATTRIBUTE_free);
1083         p7si->auth_attr=sk_X509_ATTRIBUTE_dup(sk);
1084         for (i=0; i<sk_X509_ATTRIBUTE_num(sk); i++)
1085                 {
1086                 if ((sk_X509_ATTRIBUTE_set(p7si->auth_attr,i,
1087                         X509_ATTRIBUTE_dup(sk_X509_ATTRIBUTE_value(sk,i))))
1088                     == NULL)
1089                         return(0);
1090                 }
1091         return(1);
1092         }
1093
1094 int PKCS7_set_attributes(PKCS7_SIGNER_INFO *p7si, STACK_OF(X509_ATTRIBUTE) *sk)
1095         {
1096         int i;
1097
1098         if (p7si->unauth_attr != NULL)
1099                 sk_X509_ATTRIBUTE_pop_free(p7si->unauth_attr,
1100                                            X509_ATTRIBUTE_free);
1101         p7si->unauth_attr=sk_X509_ATTRIBUTE_dup(sk);
1102         for (i=0; i<sk_X509_ATTRIBUTE_num(sk); i++)
1103                 {
1104                 if ((sk_X509_ATTRIBUTE_set(p7si->unauth_attr,i,
1105                         X509_ATTRIBUTE_dup(sk_X509_ATTRIBUTE_value(sk,i))))
1106                     == NULL)
1107                         return(0);
1108                 }
1109         return(1);
1110         }
1111
1112 int PKCS7_add_signed_attribute(PKCS7_SIGNER_INFO *p7si, int nid, int atrtype,
1113              void *value)
1114         {
1115         return(add_attribute(&(p7si->auth_attr),nid,atrtype,value));
1116         }
1117
1118 int PKCS7_add_attribute(PKCS7_SIGNER_INFO *p7si, int nid, int atrtype,
1119              void *value)
1120         {
1121         return(add_attribute(&(p7si->unauth_attr),nid,atrtype,value));
1122         }
1123
1124 static int add_attribute(STACK_OF(X509_ATTRIBUTE) **sk, int nid, int atrtype,
1125                          void *value)
1126         {
1127         X509_ATTRIBUTE *attr=NULL;
1128
1129         if (*sk == NULL)
1130                 {
1131                 *sk = sk_X509_ATTRIBUTE_new_null();
1132 new_attrib:
1133                 attr=X509_ATTRIBUTE_create(nid,atrtype,value);
1134                 sk_X509_ATTRIBUTE_push(*sk,attr);
1135                 }
1136         else
1137                 {
1138                 int i;
1139
1140                 for (i=0; i<sk_X509_ATTRIBUTE_num(*sk); i++)
1141                         {
1142                         attr=sk_X509_ATTRIBUTE_value(*sk,i);
1143                         if (OBJ_obj2nid(attr->object) == nid)
1144                                 {
1145                                 X509_ATTRIBUTE_free(attr);
1146                                 attr=X509_ATTRIBUTE_create(nid,atrtype,value);
1147                                 sk_X509_ATTRIBUTE_set(*sk,i,attr);
1148                                 goto end;
1149                                 }
1150                         }
1151                 goto new_attrib;
1152                 }
1153 end:
1154         return(1);
1155         }
1156