diff options
Diffstat (limited to 'src/lib/libcrypto/pkcs7/pk7_doit.c')
| -rw-r--r-- | src/lib/libcrypto/pkcs7/pk7_doit.c | 42 |
1 files changed, 6 insertions, 36 deletions
diff --git a/src/lib/libcrypto/pkcs7/pk7_doit.c b/src/lib/libcrypto/pkcs7/pk7_doit.c index 4ac29ae14d..b78e22819c 100644 --- a/src/lib/libcrypto/pkcs7/pk7_doit.c +++ b/src/lib/libcrypto/pkcs7/pk7_doit.c | |||
| @@ -239,13 +239,7 @@ BIO *PKCS7_dataInit(PKCS7 *p7, BIO *bio) | |||
| 239 | OPENSSL_free(tmp); | 239 | OPENSSL_free(tmp); |
| 240 | goto err; | 240 | goto err; |
| 241 | } | 241 | } |
| 242 | if (!M_ASN1_OCTET_STRING_set(ri->enc_key,tmp,jj)) | 242 | M_ASN1_OCTET_STRING_set(ri->enc_key,tmp,jj); |
| 243 | { | ||
| 244 | PKCS7err(PKCS7_F_PKCS7_DATAINIT, | ||
| 245 | ERR_R_MALLOC_FAILURE); | ||
| 246 | OPENSSL_free(tmp); | ||
| 247 | goto err; | ||
| 248 | } | ||
| 249 | } | 243 | } |
| 250 | OPENSSL_free(tmp); | 244 | OPENSSL_free(tmp); |
| 251 | OPENSSL_cleanse(key, keylen); | 245 | OPENSSL_cleanse(key, keylen); |
| @@ -526,20 +520,12 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio) | |||
| 526 | case NID_pkcs7_signedAndEnveloped: | 520 | case NID_pkcs7_signedAndEnveloped: |
| 527 | /* XXXXXXXXXXXXXXXX */ | 521 | /* XXXXXXXXXXXXXXXX */ |
| 528 | si_sk=p7->d.signed_and_enveloped->signer_info; | 522 | si_sk=p7->d.signed_and_enveloped->signer_info; |
| 529 | if (!(os=M_ASN1_OCTET_STRING_new())) | 523 | os=M_ASN1_OCTET_STRING_new(); |
| 530 | { | ||
| 531 | PKCS7err(PKCS7_F_PKCS7_DATASIGN,ERR_R_MALLOC_FAILURE); | ||
| 532 | goto err; | ||
| 533 | } | ||
| 534 | p7->d.signed_and_enveloped->enc_data->enc_data=os; | 524 | p7->d.signed_and_enveloped->enc_data->enc_data=os; |
| 535 | break; | 525 | break; |
| 536 | case NID_pkcs7_enveloped: | 526 | case NID_pkcs7_enveloped: |
| 537 | /* XXXXXXXXXXXXXXXX */ | 527 | /* XXXXXXXXXXXXXXXX */ |
| 538 | if (!(os=M_ASN1_OCTET_STRING_new())) | 528 | os=M_ASN1_OCTET_STRING_new(); |
| 539 | { | ||
| 540 | PKCS7err(PKCS7_F_PKCS7_DATASIGN,ERR_R_MALLOC_FAILURE); | ||
| 541 | goto err; | ||
| 542 | } | ||
| 543 | p7->d.enveloped->enc_data->enc_data=os; | 529 | p7->d.enveloped->enc_data->enc_data=os; |
| 544 | break; | 530 | break; |
| 545 | case NID_pkcs7_signed: | 531 | case NID_pkcs7_signed: |
| @@ -613,12 +599,7 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio) | |||
| 613 | if (!PKCS7_get_signed_attribute(si, | 599 | if (!PKCS7_get_signed_attribute(si, |
| 614 | NID_pkcs9_signingTime)) | 600 | NID_pkcs9_signingTime)) |
| 615 | { | 601 | { |
| 616 | if (!(sign_time=X509_gmtime_adj(NULL,0))) | 602 | sign_time=X509_gmtime_adj(NULL,0); |
| 617 | { | ||
| 618 | PKCS7err(PKCS7_F_PKCS7_DATASIGN, | ||
| 619 | ERR_R_MALLOC_FAILURE); | ||
| 620 | goto err; | ||
| 621 | } | ||
| 622 | PKCS7_add_signed_attribute(si, | 603 | PKCS7_add_signed_attribute(si, |
| 623 | NID_pkcs9_signingTime, | 604 | NID_pkcs9_signingTime, |
| 624 | V_ASN1_UTCTIME,sign_time); | 605 | V_ASN1_UTCTIME,sign_time); |
| @@ -627,19 +608,8 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio) | |||
| 627 | /* Add digest */ | 608 | /* Add digest */ |
| 628 | md_tmp=EVP_MD_CTX_md(&ctx_tmp); | 609 | md_tmp=EVP_MD_CTX_md(&ctx_tmp); |
| 629 | EVP_DigestFinal_ex(&ctx_tmp,md_data,&md_len); | 610 | EVP_DigestFinal_ex(&ctx_tmp,md_data,&md_len); |
| 630 | if (!(digest=M_ASN1_OCTET_STRING_new())) | 611 | digest=M_ASN1_OCTET_STRING_new(); |
| 631 | { | 612 | M_ASN1_OCTET_STRING_set(digest,md_data,md_len); |
| 632 | PKCS7err(PKCS7_F_PKCS7_DATASIGN, | ||
| 633 | ERR_R_MALLOC_FAILURE); | ||
| 634 | goto err; | ||
| 635 | } | ||
| 636 | if (!M_ASN1_OCTET_STRING_set(digest,md_data, | ||
| 637 | md_len)) | ||
| 638 | { | ||
| 639 | PKCS7err(PKCS7_F_PKCS7_DATASIGN, | ||
| 640 | ERR_R_MALLOC_FAILURE); | ||
| 641 | goto err; | ||
| 642 | } | ||
| 643 | PKCS7_add_signed_attribute(si, | 613 | PKCS7_add_signed_attribute(si, |
| 644 | NID_pkcs9_messageDigest, | 614 | NID_pkcs9_messageDigest, |
| 645 | V_ASN1_OCTET_STRING,digest); | 615 | V_ASN1_OCTET_STRING,digest); |